Skip to content

Commit

Permalink
Rollback my code to 262148b this commit where we use themes and remov…
Browse files Browse the repository at this point in the history
…ed config.py
  • Loading branch information
WithSJ committed Jan 5, 2021
1 parent fc6988a commit 5b9755d
Show file tree
Hide file tree
Showing 19 changed files with 69 additions and 51 deletions.
4 changes: 0 additions & 4 deletions config.py

This file was deleted.

14 changes: 14 additions & 0 deletions formatter.py
Original file line number Diff line number Diff line change
@@ -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(".")
2 changes: 1 addition & 1 deletion libs/applibs/utils.py
Original file line number Diff line number Diff line change
@@ -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")):
Expand Down
2 changes: 1 addition & 1 deletion libs/uix/baseclass/chat_room.py
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
2 changes: 1 addition & 1 deletion libs/uix/baseclass/forgot.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from main_imports import MDScreen
from libs.applibs import utils
from main_imports import MDScreen

utils.load_kv("forgot.kv")

Expand Down
2 changes: 1 addition & 1 deletion libs/uix/baseclass/home.py
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
2 changes: 1 addition & 1 deletion libs/uix/baseclass/login.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from main_imports import MDScreen
from libs.applibs import utils
from main_imports import MDScreen

utils.load_kv("login.kv")

Expand Down
3 changes: 2 additions & 1 deletion libs/uix/baseclass/profile.py
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
6 changes: 4 additions & 2 deletions libs/uix/baseclass/root.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion libs/uix/baseclass/signup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from main_imports import MDScreen
from libs.applibs import utils
from main_imports import MDScreen

utils.load_kv("signup.kv")

Expand Down
3 changes: 2 additions & 1 deletion libs/uix/baseclass/ui_class.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion libs/uix/baseclass/verification.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from main_imports import MDScreen
from libs.applibs import utils
from main_imports import MDScreen

utils.load_kv("verification.kv")

Expand Down
6 changes: 2 additions & 4 deletions libs/uix/kv/forgot.kv
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#:import APP_NAME config.APP_NAME
#:import COMPANY_NAME config.COMPANY_NAME
<Forgot_Screen>:
name: "forgot"
MDLabel:
text: APP_NAME
text: app.APP_NAME
halign: "center"
pos_hint: {"center_y": .8}
font_style: "H3"
Expand Down Expand Up @@ -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}
Expand Down
5 changes: 1 addition & 4 deletions libs/uix/kv/home.kv
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
#:import APP_NAME config.APP_NAME
#:import COMPANY_NAME config.COMPANY_NAME

<Home_Screen>:
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
Expand Down
6 changes: 2 additions & 4 deletions libs/uix/kv/login.kv
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#:import APP_NAME config.APP_NAME
#:import COMPANY_NAME config.COMPANY_NAME
<Login_Screen>:
name: "login"

MDLabel:
text: APP_NAME
text: app.APP_NAME
halign: "center"
pos_hint: {"center_y": .8}
font_style: "H3"
Expand Down Expand Up @@ -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}
Expand Down
6 changes: 2 additions & 4 deletions libs/uix/kv/signup.kv
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#:import APP_NAME config.APP_NAME
#:import COMPANY_NAME config.COMPANY_NAME
<Signup_Screen>:
name: "signup"
MDLabel:
text: APP_NAME
text: app.APP_NAME
halign: "center"
pos_hint: {"center_y": .8}
font_style: "H3"
Expand Down Expand Up @@ -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}
Expand Down
6 changes: 2 additions & 4 deletions libs/uix/kv/verification.kv
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
#:import APP_NAME config.APP_NAME
#:import COMPANY_NAME config.COMPANY_NAME
<Verification_Screen>:
name: "verification"
MDLabel:
text: APP_NAME
text: app.APP_NAME
halign: "center"
pos_hint: {"center_y": .8}
font_style: "H3"
Expand Down Expand Up @@ -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}
Expand Down
28 changes: 21 additions & 7 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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):
"""
Expand All @@ -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
Expand Down
19 changes: 10 additions & 9 deletions main_imports.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down

0 comments on commit 5b9755d

Please sign in to comment.