Merge pull request #5 from HypoT/typewriter_bits

looks good

Author: SlashScreen

jurassic-journalists/buttons.kv

@@ -0,0 +1,35 @@
+#:import Animation kivy.animation.Animation
+<TypeWriterButton@Button>:
+	width: self.parent.width * 1/17
+	height: self.parent.height * 1/23
+    size_hint: None, None
+	txt: ''
+	background_normal: f'atlas://typewriter/{self.txt}' if self.txt else ''
+	background_down: self.background_normal
+	border: 0,0,0,0
+	on_press: Animation(anim_y =  self.anim_y - .005, d=.025, t='in_bounce').start(self); self.sound.play()
+	# canvas.before:
+	#    Color:
+	#	    rgba: (0,0,0,0) if self.state == 'normal' else (0,.7,.7,.1)
+    #    RoundedRectangle:
+    #        pos: self.pos
+    #        size: self.size
+    #        radius: 5,
+
+<Row1@TypeWriterButton>:
+    default_y: .175
+    anim_y: .175
+
+<Row2@TypeWriterButton>:
+    default_y: .13
+    anim_y: .13
+
+<Row3@TypeWriterButton>:
+    default_y: .08
+    anim_y: .08
+
+<PhoneButtons@Label>
+    width: self.parent.width * 1/5
+	height: self.parent.height * 1/10
+    size_hint: None, None
+    

jurassic-journalists/click.wav

@@ -1,25 +1,13 @@
 #:import F kivy.factory.Factory
 #:import Letter classes.Letter
-<TypeWriterButton@Button>:
-	width: self.parent.width * 1/20
-	height: self.parent.height * 1/20
-    size_hint: None, None
-	background_color: 0,0,0,0
-	text_color: 0,0,0,0
-    on_release: self.parent.typw.text += self.txt
-	canvas.before:
-	    Color:
-		    rgba: (0,0,0,0) if self.state == 'normal' else (0,.7,.7,.1)
-        RoundedRectangle:
-            pos: self.pos
-            size: self.size
-            radius: 5,
+#:import random random.random
+#<Widget>:
+#    canvas.after:
+#        Color:
+#            rgba: random(), random(), random()
+#		Line:
+#		    rectangle: [self.x, self.y, self.width, self.height]
 
-<PhoneButtons@Label>
-    width: self.parent.width * 1/5
-	height: self.parent.height * 1/10
-    size_hint: None, None
-		
 <RoomScreen>:
     name: 'RoomScreen'
     canvas:
@@ -35,18 +23,15 @@
 	Button:
 	    size_hint: None, None
 	    pos_hint: {'x': .7, 'y': .45}
-	    background_normal: 'paper.png'
-	    background_down: 'paper.png'
-	    on_release: F.TypeW().open()
+	    background_normal: 'typewriter.png'
+	    background_down: 'typewriter.png'
+	    on_release: F.TypeWriter().open()
 
 
 <MainScreen@ScreenManager>:
     RoomScreen
 	PhoneScreen
 
-
-<TextPaper@Image>
-
 <PhoneScreen>:
     name: 'PhoneScreen'
 	typw2: typw2
@@ -106,129 +91,3 @@
 		text: ''
 		pos_hint: {'x': .6, 'y':0}
 	    disabled: True
-
-
-<TypeW@Popup>
-    canvas.before:
-        Color:
-            rgba: 0,0,0,0
-        Rectangle:
-            pos: self.pos
-            size: self.size
-    canvas.after:    
-        Color:
-            rgba: 1,1,1,.5
-        Rectangle:
-            pos: self.pos
-            size: self.size
-            source: 'paper.png'
-    title: ''
-    separator_color: 0,0,0,0
-	FloatLayout:
-		typw: typw
-		GestureSurface:
-			on_gesture_complete: typw.text += '_b'
-		TextPaper:
-			id: typw
-			source: 'blank.png'
-			pos_hint: {'x': 0.2, 'y':.5}
-			size_hint: .7, .5
-			allow_stretch: True
-			letters: []
-			text: ''
-			on_text: 
-			    self.letters.append(Letter(self.text[-1], 32, '1942.ttf')) if '_' not in self.text[-2:] else self.escaped()
-			on_letters: self.update()
-		TypeWriterButton:
-			txt: 'q'
-			pos_hint: {'x': .16, 'y':.175}
-		TypeWriterButton:
-			txt: 'w'
-			pos_hint: {'x': .235, 'y':.175}
-		TypeWriterButton:
-			txt: 'e'
-			pos_hint: {'x': .31, 'y':.175}
-		TypeWriterButton:
-			txt: 'r'
-			pos_hint: {'x': .385, 'y':.175}
-		TypeWriterButton:
-			txt: 't'
-			pos_hint: {'x': .46, 'y':.175}
-		TypeWriterButton:
-			txt: 'y'
-			pos_hint: {'x': .535, 'y':.175}
-		TypeWriterButton:
-			txt: 'u'
-			pos_hint: {'x': .61, 'y':.175}
-		TypeWriterButton:
-			txt: 'i'
-			pos_hint: {'x': .685, 'y':.175}
-		TypeWriterButton:
-			txt: 'o'
-			pos_hint: {'x': .76, 'y':.175}
-		TypeWriterButton:
-			txt: 'p'
-			pos_hint: {'x': .835, 'y':.175}
-		TypeWriterButton:
-			txt: 'a'
-			pos_hint: {'x': .2, 'y':.125}
-		TypeWriterButton:
-			txt: 's'
-			pos_hint: {'x': .275, 'y':.125}
-		TypeWriterButton:
-			txt: 'd'
-			pos_hint: {'x': .35, 'y':.125}
-		TypeWriterButton
-			txt: 'f'
-			pos_hint: {'x': .425, 'y':.125}
-		TypeWriterButton
-			txt: 'g'
-			pos_hint: {'x': .5, 'y':.125}
-		TypeWriterButton:
-			txt: 'h'
-			pos_hint: {'x': .575, 'y':.125}
-		TypeWriterButton:
-			txt: 'j'
-			pos_hint: {'x': .65, 'y':.125}
-		TypeWriterButton:
-			txt: 'k'
-			pos_hint: {'x': .725, 'y':.125}
-		TypeWriterButton:
-			txt: 'l'
-			pos_hint: {'x': .8, 'y':.125}
-		TypeWriterButton:
-			txt: 'z'
-			pos_hint: {'x': .2, 'y':.08}
-		TypeWriterButton:
-			txt: 'x'
-			pos_hint: {'x': .275, 'y':.08}
-		TypeWriterButton:
-			txt: 'c'
-			pos_hint: {'x': .35, 'y':.08}
-		TypeWriterButton:
-			txt: 'v'
-			pos_hint: {'x': .425, 'y':.08}
-		TypeWriterButton:
-			txt: 'b'
-			pos_hint: {'x': .5, 'y':.08}
-		TypeWriterButton:
-			txt: 'n'
-			pos_hint: {'x': .575, 'y':.08}
-		TypeWriterButton:
-			txt: 'm'
-			pos_hint: {'x': .65, 'y':.08}
-		TypeWriterButton:
-			txt: ';'
-			pos_hint: {'x': .725, 'y':.08}
-		TypeWriterButton:
-			txt: ':'
-			pos_hint: {'x': .8, 'y':.08}
-		TypeWriterButton:
-			pos_hint: {'x': .2, 'y':0}
-			size_hint: .65, None
-	    	height: self.parent.height * 1/20
-			txt: ' '
-		TypeWriterButton:
-		    pos_hint: {'x': .85, 'y': .4}
-			size_hint: .15, .15
-			txt: '_n'

jurassic-journalists/jurassicjournalist.kv

@@ -1,30 +1,33 @@
 '''Jurassic Journalists'''
+from io import BytesIO
+from kivy.config import Config
+Config.set('graphics', 'resizable', False) # noqa
 from kivy.app import App
 from kivy.core.image import Image as CoreImage
 from kivy.uix.screenmanager import ScreenManager, Screen
 from kivy.uix.label import Label
+from kivy.uix.button import Button
 from kivy.uix.image import Image
-from kivy.uix.widget import Widget
+from kivy.lang import Builder
+from kivy.properties import ListProperty, ObjectProperty, NumericProperty # noqa
+from kivy.core.window import Window
+from kivy.animation import Animation
+from kivy.core.audio import SoundLoader
 from PIL import ImageDraw
 from PIL import Image as Im
-from io import BytesIO
-from kivy.properties import ListProperty, ObjectProperty, NumericProperty
-from math import sin, cos, pi
-from kivy.core.window import Window
 
-# Global Variable so there is no magic number.
-SCREEN_WIDTH = 720
-SCREEN_HEIGHT = 720
-PAPER_COLOR = (200, 200, 200, 0)
-STARTING_Y = SCREEN_HEIGHT - 150
 
+# Global Variables
 
-class JurassicJournalistApp(App):
-    ''' App Class '''
-    def build(self):
-#        Window.borderless = True
-        return MainScreen()
+# Screen Dimensions
+SCREEN_WIDTH = 720
+SCREEN_HEIGHT = 1280
 
+# Paper Dimensions
+STARTING_X = 50 # PAPER_WIDTH - 240
+STARTING_Y = 50 # PAPER_HEIGHT + 100
+PAPER_WIDTH = SCREEN_WIDTH * .7 - STARTING_X
+PAPER_HEIGHT = 720 # SCREEN_HEIGHT
 
 class MainScreen(ScreenManager):
     ''' ScreenManager '''
@@ -38,26 +41,42 @@ class PhoneScreen(Screen):
     ''' Screen Two '''
 
 
+class TypeWriterButton(Button):
+    sound = SoundLoader.load('click.wav')
+    def on_release(self):
+        self.parent.typw.text += self.txt
+        if abs(self.anim_y - self.default_y) >= .01:
+            Animation(anim_y = self.default_y, d=.025, t='out_bounce').start(self)
+        else:
+            Animation(anim_y = self.anim_y + .005, d=.025, t='out_bounce').start(self)
+       
+
+
 class TextPaper(Image):
     """
-    mesh_points = ListProperty([])
-    mesh_texture = ObjectProperty(None)
-    radius = NumericProperty(200)
-    offset_x = NumericProperty(.5)
-    offset_y = NumericProperty(.5)
-    sin_wobble = NumericProperty(0)
-    sin_wobble_speed = NumericProperty(0)
+    TypeWriter Paper
     """
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
+        '''
+        # actual screen size will be different, may need to adjust
+        SCREEN_WIDTH, SCREEN_HEIGHT = Window.size
+        PAPER_WIDTH = SCREEN_WIDTH * .7 - 50
+        PAPER_HEIGHT = SCREEN_HEIGHT
+        '''
         # Creating Blank Paper image to type on.
-        self.img = Im.new("RGBA", (SCREEN_WIDTH, SCREEN_HEIGHT), PAPER_COLOR)
-
+        # self.img = Im.open("paper.png")
+        # self.img.resize((int(SCREEN_WIDTH *.75), SCREEN_HEIGHT))
+        self.img = Im.new('RGBA', (int(SCREEN_WIDTH *.75), PAPER_HEIGHT), (200,200,200,255))
+        self.default_pos = 225,  - (SCREEN_HEIGHT - PAPER_HEIGHT)//2 + STARTING_Y + 10
         # Type writer does not type from the top rather type from the bottom.
         self.txt = self.img.copy()
-        self.head = {'x': 0, 'y': STARTING_Y}
+        self.head = {'x': STARTING_X, 'y': STARTING_Y}
+        self.pos = self.default_pos
+        self.size = [PAPER_WIDTH, PAPER_HEIGHT]
 
+        self.first_letter = True
+        self.font_size = None
         """
         self.mesh_texture = CoreImage('paper.png').texture
         Clock.schedule_interval(self.update_points, 0)
@@ -83,22 +102,41 @@ def type(self, key):
         ImageDraw.Draw(self.txt).text((self.head["x"], self.head["y"]),
                                       key.char, font=key.font, fill=key.color)
         # Scrolling up
+
+        # Shoudln't move paper if it is the first letter of the line
+        if self.first_letter:
+            self.first_letter = False
+        else:
+            self.pos[0] -= (self.char_size)
+
         self.font_size = key.font.getsize("l")[1]
         self.char_size = key.get_kerning()[0]
         self.head["x"] += self.char_size
 
-        if self.head["x"] + self.char_size >= SCREEN_WIDTH:
-            self.head["x"] = 0
-            self.head["y"] -= self.font_size
+        if (self.head["x"] - STARTING_X) + self.char_size >= PAPER_WIDTH:
+            self.head["x"] = STARTING_X
+            self.head["y"] += self.font_size
+            self.y += self.font_size
+            #self.x = self.default_pos[0]
+
+            # 10 is to adjust the height. If you guys can investigate why it is not
+            # matching the height and width of letter defined in kv file that would be great.
+            line_height = self.head["y"] - STARTING_Y - 10
+            self.pos = [self.default_pos[0], self.default_pos[1]+line_height]
+            self.first_letter = True
 
     def escaped(self):
         if not self.font_size:
             return
         if self.text[-2:] == '_b':
             self.head["x"] -= self.char_size
+            self.x += self.char_size
         elif self.text[-2:] == '_n':
-            self.head['y'] -= self.font_size
-            self.head['x'] = 0
+            self.head['y'] += self.font_size
+            self.head['x'] = STARTING_X
+            self.y += self.font_size
+            self.x = self.default_pos[0]
+
 
 class PhoneButtons(Label):
     ''' Phone Button/Label '''
@@ -123,4 +161,16 @@ def on_button_touch_down(self, touch):
         return True
 
 
-JurassicJournalistApp().run()
+class JurassicJournalistApp(App):
+    ''' App Class '''
+    def build(self):
+        Window.size = SCREEN_WIDTH, SCREEN_HEIGHT
+        print(Window.size)
+        Builder.load_file('buttons.kv')
+        Builder.load_file('objects.kv')
+        Window.borderless = True
+        return MainScreen()
+
+
+if __name__ == '__main__':
+    JurassicJournalistApp().run()