diff --git a/config.py b/config.py deleted file mode 100644 index 6b34ea2..0000000 --- a/config.py +++ /dev/null @@ -1,4 +0,0 @@ -# Set Global variables name - -APP_NAME = "Hamster" -COMPANY_NAME = "Hamster.org" diff --git a/formatter.py b/formatter.py new file mode 100644 index 0000000..5b9d158 --- /dev/null +++ b/formatter.py @@ -0,0 +1,14 @@ +import os + + +def format(path): + for root, dirs, files in os.walk(path): + for file in files: + if os.path.splitext(file)[1] != ".py": + continue + _file = os.path.join(root, file) + os.system(f"python3 -m black {_file}") + os.system(f"python3 -m isort {_file}") + + +format(".") diff --git a/libs/applibs/utils.py b/libs/applibs/utils.py index ee53ac9..5953e32 100644 --- a/libs/applibs/utils.py +++ b/libs/applibs/utils.py @@ -1,6 +1,6 @@ import os -from main_imports import Builder +from main_imports import Builder def load_kv(file_name, file_path=os.path.join("libs", "uix", "kv")): diff --git a/libs/uix/baseclass/chat_room.py b/libs/uix/baseclass/chat_room.py index 9d7f570..681b1a0 100644 --- a/libs/uix/baseclass/chat_room.py +++ b/libs/uix/baseclass/chat_room.py @@ -1,5 +1,5 @@ -from main_imports import MDScreen,MDCard,MDLabel,MDSeparator from libs.applibs import utils +from main_imports import MDCard, MDLabel, MDScreen, MDSeparator utils.load_kv("chat_room.kv") diff --git a/libs/uix/baseclass/forgot.py b/libs/uix/baseclass/forgot.py index 700206a..afff144 100644 --- a/libs/uix/baseclass/forgot.py +++ b/libs/uix/baseclass/forgot.py @@ -1,5 +1,5 @@ -from main_imports import MDScreen from libs.applibs import utils +from main_imports import MDScreen utils.load_kv("forgot.kv") diff --git a/libs/uix/baseclass/home.py b/libs/uix/baseclass/home.py index 789558f..99d81a7 100644 --- a/libs/uix/baseclass/home.py +++ b/libs/uix/baseclass/home.py @@ -1,5 +1,5 @@ -from main_imports import MDScreen,TwoLineAvatarListItem,ImageLeftWidget from libs.applibs import utils +from main_imports import ImageLeftWidget, MDScreen, TwoLineAvatarListItem utils.load_kv("home.kv") diff --git a/libs/uix/baseclass/login.py b/libs/uix/baseclass/login.py index 6ae7bfa..84c582e 100644 --- a/libs/uix/baseclass/login.py +++ b/libs/uix/baseclass/login.py @@ -1,5 +1,5 @@ -from main_imports import MDScreen from libs.applibs import utils +from main_imports import MDScreen utils.load_kv("login.kv") diff --git a/libs/uix/baseclass/profile.py b/libs/uix/baseclass/profile.py index 0c704ba..66661f8 100644 --- a/libs/uix/baseclass/profile.py +++ b/libs/uix/baseclass/profile.py @@ -1,5 +1,6 @@ -from main_imports import MDScreen,MDGridBottomSheet,OneLineTextDialog,MDDialog,MDFlatButton from libs.applibs import utils +from main_imports import (MDDialog, MDFlatButton, MDGridBottomSheet, MDScreen, + OneLineTextDialog) utils.load_kv("profile.kv") diff --git a/libs/uix/baseclass/root.py b/libs/uix/baseclass/root.py index 4114582..7716472 100644 --- a/libs/uix/baseclass/root.py +++ b/libs/uix/baseclass/root.py @@ -1,6 +1,8 @@ -from main_imports import ScreenManager -from libs.applibs import utils from kivy.core.window import Window + +from libs.applibs import utils +from main_imports import ScreenManager + utils.load_kv("root.kv") class Root(ScreenManager): diff --git a/libs/uix/baseclass/signup.py b/libs/uix/baseclass/signup.py index 9fb1f54..84901b2 100644 --- a/libs/uix/baseclass/signup.py +++ b/libs/uix/baseclass/signup.py @@ -1,5 +1,5 @@ -from main_imports import MDScreen from libs.applibs import utils +from main_imports import MDScreen utils.load_kv("signup.kv") diff --git a/libs/uix/baseclass/ui_class.py b/libs/uix/baseclass/ui_class.py index d05e051..7e658d8 100644 --- a/libs/uix/baseclass/ui_class.py +++ b/libs/uix/baseclass/ui_class.py @@ -1,5 +1,6 @@ -from main_imports import BoxLayout from libs.applibs import utils +from main_imports import BoxLayout + utils.load_kv("ui_class.kv") class OneLineTextDialog(BoxLayout): diff --git a/libs/uix/baseclass/verification.py b/libs/uix/baseclass/verification.py index 43189a8..f45d6f2 100644 --- a/libs/uix/baseclass/verification.py +++ b/libs/uix/baseclass/verification.py @@ -1,5 +1,5 @@ -from main_imports import MDScreen from libs.applibs import utils +from main_imports import MDScreen utils.load_kv("verification.kv") diff --git a/libs/uix/kv/forgot.kv b/libs/uix/kv/forgot.kv index ad0b7f3..1611e44 100755 --- a/libs/uix/kv/forgot.kv +++ b/libs/uix/kv/forgot.kv @@ -1,9 +1,7 @@ -#:import APP_NAME config.APP_NAME -#:import COMPANY_NAME config.COMPANY_NAME : name: "forgot" MDLabel: - text: APP_NAME + text: app.APP_NAME halign: "center" pos_hint: {"center_y": .8} font_style: "H3" @@ -39,7 +37,7 @@ on_release: app.screen_manager.change_screen("login") MDLabel: - text: f"[font=Icons] {md_icons['copyright']}[/font] [font=Roboto]{COMPANY_NAME} 2020[/font]" + text: f"[font=Icons] {md_icons['copyright']}[/font] [font=Roboto]{app.COMPANY_NAME} 2020[/font]" markup: True halign: "center" pos_hint: {"center_y":0.05} diff --git a/libs/uix/kv/home.kv b/libs/uix/kv/home.kv index 21676be..ad5f1ea 100755 --- a/libs/uix/kv/home.kv +++ b/libs/uix/kv/home.kv @@ -1,13 +1,10 @@ -#:import APP_NAME config.APP_NAME -#:import COMPANY_NAME config.COMPANY_NAME - : name: "home" BoxLayout: orientation:'vertical' MDToolbar: - title: APP_NAME + title: app.APP_NAME size_hint: 1,.08 right_action_items: [ ["account", lambda x:app.screen_manager.change_screen("profile")]] elevation: 5 diff --git a/libs/uix/kv/login.kv b/libs/uix/kv/login.kv index 78635ec..f962d44 100755 --- a/libs/uix/kv/login.kv +++ b/libs/uix/kv/login.kv @@ -1,10 +1,8 @@ -#:import APP_NAME config.APP_NAME -#:import COMPANY_NAME config.COMPANY_NAME : name: "login" MDLabel: - text: APP_NAME + text: app.APP_NAME halign: "center" pos_hint: {"center_y": .8} font_style: "H3" @@ -46,7 +44,7 @@ on_release: app.screen_manager.change_screen("signup") MDLabel: - text: f"[font=Icons] {md_icons['copyright']}[/font] [font=Roboto]{COMPANY_NAME} 2020[/font]" + text: f"[font=Icons] {md_icons['copyright']}[/font] [font=Roboto]{app.COMPANY_NAME} 2020[/font]" markup: True halign: "center" pos_hint: {"center_y":0.05} diff --git a/libs/uix/kv/signup.kv b/libs/uix/kv/signup.kv index 6ba65b8..938a37b 100755 --- a/libs/uix/kv/signup.kv +++ b/libs/uix/kv/signup.kv @@ -1,9 +1,7 @@ -#:import APP_NAME config.APP_NAME -#:import COMPANY_NAME config.COMPANY_NAME : name: "signup" MDLabel: - text: APP_NAME + text: app.APP_NAME halign: "center" pos_hint: {"center_y": .8} font_style: "H3" @@ -51,7 +49,7 @@ on_release: app.screen_manager.change_screen("login") MDLabel: - text: f"[font=Icons] {md_icons['copyright']}[/font] [font=Roboto]{COMPANY_NAME} 2020[/font]" + text: f"[font=Icons] {md_icons['copyright']}[/font] [font=Roboto]{app.COMPANY_NAME} 2020[/font]" markup: True halign: "center" pos_hint: {"center_y":0.05} diff --git a/libs/uix/kv/verification.kv b/libs/uix/kv/verification.kv index 825d2db..9cb7555 100755 --- a/libs/uix/kv/verification.kv +++ b/libs/uix/kv/verification.kv @@ -1,9 +1,7 @@ -#:import APP_NAME config.APP_NAME -#:import COMPANY_NAME config.COMPANY_NAME : name: "verification" MDLabel: - text: APP_NAME + text: app.APP_NAME halign: "center" pos_hint: {"center_y": .8} font_style: "H3" @@ -44,7 +42,7 @@ font_style: "Caption" MDLabel: - text: f"[font=Icons] {md_icons['copyright']}[/font] [font=Roboto]{COMPANY_NAME} 2020[/font]" + text: f"[font=Icons] {md_icons['copyright']}[/font] [font=Roboto]{app.COMPANY_NAME} 2020[/font]" markup: True halign: "center" pos_hint: {"center_y":0.05} diff --git a/main.py b/main.py index 5519e36..4925753 100644 --- a/main.py +++ b/main.py @@ -2,6 +2,7 @@ """This code to detect it's Android or not if it's not android than app window size change in android phone size""" from kivy.utils import platform + if platform != 'android': from kivy.config import Config Config.set("graphics","width",360) @@ -12,20 +13,21 @@ """code for android keyboard. when in android keyboard show textbox automatic go to top of keyboard so user can see when he type msg""" from kivy.core.window import Window + Window.keyboard_anim_args = {"d":.2,"t":"linear"} Window.softinput_mode = "below_target" #--[End Soft_Keyboard code ] -from main_imports import MDApp,TwoLineAvatarListItem,ImageLeftWidget - -from libs.uix.baseclass.root import Root -from libs.uix.baseclass.login import Login_Screen -from libs.uix.baseclass.signup import Signup_Screen +from libs.uix.baseclass.chat_room import Chat_Room_Screen from libs.uix.baseclass.forgot import Forgot_Screen -from libs.uix.baseclass.verification import Verification_Screen from libs.uix.baseclass.home import Home_Screen -from libs.uix.baseclass.chat_room import Chat_Room_Screen +from libs.uix.baseclass.login import Login_Screen from libs.uix.baseclass.profile import Profile_Screen +from libs.uix.baseclass.root import Root +from libs.uix.baseclass.signup import Signup_Screen +from libs.uix.baseclass.verification import Verification_Screen +from main_imports import ImageLeftWidget, MDApp, TwoLineAvatarListItem + class HamsterApp(MDApp): """ @@ -36,6 +38,18 @@ class HamsterApp(MDApp): def __init__(self, **kwargs): super(HamsterApp, self).__init__(**kwargs) + self.APP_NAME = "Hamster" + self.COMPANY_NAME = "Hamster.org" + + self.theme_cls.primary_palette = "Blue" + self.theme_cls.primary_hue = "500" + + self.theme_cls.accent_palette = "Amber" + self.theme_cls.accent_hue = "500" + + self.theme_cls.theme_style = "Light" + + def chat_room(self,touch,a): """Switch to Chatroom. but username and chatroom username diff --git a/main_imports.py b/main_imports.py index 36171d0..c13a5b1 100644 --- a/main_imports.py +++ b/main_imports.py @@ -6,21 +6,22 @@ #--[Start UI Imports] """All imports for UI here Kivy,KivyMD or etc that help in UI""" -from kivymd.app import MDApp from kivy.lang import Builder +from kivy.uix.boxlayout import BoxLayout +from kivy.uix.floatlayout import FloatLayout from kivy.uix.screenmanager import ScreenManager +from kivymd.app import MDApp +from kivymd.uix.bottomsheet import MDGridBottomSheet +from kivymd.uix.button import MDFlatButton +from kivymd.uix.card import MDCard, MDSeparator +from kivymd.uix.dialog import MDDialog +from kivymd.uix.label import MDLabel +from kivymd.uix.list import ImageLeftWidget, TwoLineAvatarListItem from kivymd.uix.screen import MDScreen -from kivy.uix.floatlayout import FloatLayout from kivymd.uix.tab import MDTabsBase -from kivymd.uix.list import TwoLineAvatarListItem,ImageLeftWidget -from kivymd.uix.label import MDLabel -from kivymd.uix.card import MDCard,MDSeparator -from kivy.uix.boxlayout import BoxLayout -from kivymd.uix.dialog import MDDialog -from kivymd.uix.button import MDFlatButton from kivymd.uix.textfield import MDTextField + from libs.uix.baseclass.ui_class import OneLineTextDialog -from kivymd.uix.bottomsheet import MDGridBottomSheet #--[End UI Imports]