From a7e8990afe0ccda7d17e3ba23b28a0e685f3a701 Mon Sep 17 00:00:00 2001 From: navjot Date: Wed, 18 Mar 2020 18:30:45 +0530 Subject: [PATCH] removed payment method Screen --- src/bitmessagekivy/kv/payment.kv | 4 +- src/bitmessagekivy/kv/payment_method.kv | 57 ------------------------- src/bitmessagekivy/main.kv | 2 - src/bitmessagekivy/mpybit.py | 15 ++----- 4 files changed, 4 insertions(+), 74 deletions(-) delete mode 100644 src/bitmessagekivy/kv/payment_method.kv diff --git a/src/bitmessagekivy/kv/payment.kv b/src/bitmessagekivy/kv/payment.kv index 0d14e2ca..9223c4ed 100644 --- a/src/bitmessagekivy/kv/payment.kv +++ b/src/bitmessagekivy/kv/payment.kv @@ -47,7 +47,7 @@ size: self.size size: dp(app.window_size[0] - 2*self.parent.parent.padding[0]) - 10 , 1 height: dp(40) - on_press: root.get_available_credits(self) + on_press: root.get_free_credits(self) MDLabel: font_style: 'H6' text: 'Get Free Credits' @@ -93,7 +93,6 @@ size: self.size size: dp(app.window_size[0] - 2*self.parent.parent.padding[0]) - 10 , 1 height: dp(40) - on_press: app.root.ids.scr_mngr.current = 'pay-options' on_press: root.move_to_pay_option(py2.text) MDLabel: font_style: 'H6' @@ -140,7 +139,6 @@ size: self.size size: dp(app.window_size[0] - 2*self.parent.parent.padding[0]) - 10 , 1 height: dp(40) - on_press: app.root.ids.scr_mngr.current = 'pay-options' on_press: root.move_to_pay_option(py3.text) MDLabel: font_style: 'H6' diff --git a/src/bitmessagekivy/kv/payment_method.kv b/src/bitmessagekivy/kv/payment_method.kv deleted file mode 100644 index f304d00c..00000000 --- a/src/bitmessagekivy/kv/payment_method.kv +++ /dev/null @@ -1,57 +0,0 @@ -: - 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) \ No newline at end of file diff --git a/src/bitmessagekivy/main.kv b/src/bitmessagekivy/main.kv index 92889b31..0e6ec253 100644 --- a/src/bitmessagekivy/main.kv +++ b/src/bitmessagekivy/main.kv @@ -259,8 +259,6 @@ NavigationLayout: id:sc19 Archieve: id:sc20 - PaymentMethods: - id:sc21 MDNavigationDrawer: id: nav_drawer diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py index f5dcebe4..8da4314c 100644 --- a/src/bitmessagekivy/mpybit.py +++ b/src/bitmessagekivy/mpybit.py @@ -73,8 +73,7 @@ KVFILES = [ 'settings', 'popup', 'allmails', 'draft', 'maildetail', 'common_widgets', 'addressbook', 'myaddress', 'composer', 'payment', 'sent', - 'network', 'login', 'credits', 'trash', 'inbox', - 'payment_method' + 'network', 'login', 'credits', 'trash', 'inbox' ] @@ -878,7 +877,7 @@ class MyTextInput(TextInput): class Payment(Screen): """Payment module""" - def get_available_credits(self, instance): + def get_free_credits(self, instance): """Get the available credits""" # pylint: disable=no-self-use 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 """Option move to pay""" - state.kivyapp.set_toolbar_for_QrCode() + pass class Credits(Screen): @@ -2997,11 +2996,3 @@ class ToAddrBoxlayout(BoxLayout): def set_toAddress(self, to_addr): """This method is use to set to address""" self.to_addr = to_addr - - -class PaymentMethods(Screen): - """PaymentMethods Screen show widgets of page""" - - def redirect_on_web(self, instance): - """Redirect on web""" - pass