parent 4d9d843

author katerinamant <[email protected]> 1672327176 +0200 committer Alex Papadopoulos <[email protected]> 1673260252 +0200 Modify .gitignore Add sidebar buttons and their user interactions Add info page and logout feature Add home screen slideshow and banner with gradient Add functionality for slideshow prev and next buttons Add github and linkedin links on Info screen Add movie class, movie widget, place movie widgets on home screen Add functionality for slideshow prev and next buttons Add github and linkedin links on Info screen Add movie class, movie widget, place movie widgets on home screen Add movie screen for when clicking on a movie widget Design and implement functionality of movie screen popup Store imported movies and display them in home screen Add to new releases Add more movies (alexisthedev#3) * Add to new releases Co-authored-by: katerinamant <[email protected]> Add movie database Add slider widget Show movies on browse screen Add movies and change pictures
katerinamant · Jan 9, 2023 · f37e94a · f37e94a
1 parent 4d9d843
commit f37e94a
Show file tree

Hide file tree

Showing 81 changed files with 1,104 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,7 +31,15 @@
 *.out
 *.app
 
+# Visual Studio & Visual Studio Code
+.vs/
 .vscode/
+*.sln
+*.vcxproj
+*.vcxproj.*
+x64/
+
+# Build files
 bin/*
 !bin/assets/
 misc/
diff --git a/bin/assets/alex.png b/bin/assets/alex.png
diff --git a/bin/assets/back.png b/bin/assets/back.png
diff --git a/bin/assets/background.png b/bin/assets/background.png
diff --git a/bin/assets/bpwf.png b/bin/assets/bpwf.png
diff --git a/bin/assets/browse.png b/bin/assets/browse.png
diff --git a/bin/assets/everything.png b/bin/assets/everything.png
diff --git a/bin/assets/github.png b/bin/assets/github.png
diff --git a/bin/assets/home.png b/bin/assets/home.png
diff --git a/bin/assets/homepage.png b/bin/assets/homepage.png
diff --git a/bin/assets/info.png b/bin/assets/info.png
diff --git a/bin/assets/kate.png b/bin/assets/kate.png
diff --git a/bin/assets/left.png b/bin/assets/left.png
diff --git a/bin/assets/linkedin.png b/bin/assets/linkedin.png
diff --git a/bin/assets/logout.png b/bin/assets/logout.png
diff --git a/bin/assets/movies/bpwf.png b/bin/assets/movies/bpwf.png
diff --git a/bin/assets/movies/bpwf1.png b/bin/assets/movies/bpwf1.png
diff --git a/bin/assets/movies/bpwf2.png b/bin/assets/movies/bpwf2.png
diff --git a/bin/assets/movies/bpwfb.png b/bin/assets/movies/bpwfb.png
diff --git a/bin/assets/movies/bpwfp.png b/bin/assets/movies/bpwfp.png
diff --git a/bin/assets/movies/clue.png b/bin/assets/movies/clue.png
diff --git a/bin/assets/movies/clue1.png b/bin/assets/movies/clue1.png
diff --git a/bin/assets/movies/clue2.png b/bin/assets/movies/clue2.png
diff --git a/bin/assets/movies/clueb.png b/bin/assets/movies/clueb.png
diff --git a/bin/assets/movies/cluep.png b/bin/assets/movies/cluep.png
diff --git a/bin/assets/movies/elvis.png b/bin/assets/movies/elvis.png
diff --git a/bin/assets/movies/elvis1.png b/bin/assets/movies/elvis1.png
diff --git a/bin/assets/movies/elvis2.png b/bin/assets/movies/elvis2.png
diff --git a/bin/assets/movies/elvisb.png b/bin/assets/movies/elvisb.png
diff --git a/bin/assets/movies/elvisp.png b/bin/assets/movies/elvisp.png
diff --git a/bin/assets/movies/encanto.png b/bin/assets/movies/encanto.png
diff --git a/bin/assets/movies/encanto1.png b/bin/assets/movies/encanto1.png
diff --git a/bin/assets/movies/encanto2.png b/bin/assets/movies/encanto2.png
diff --git a/bin/assets/movies/encantob.png b/bin/assets/movies/encantob.png
diff --git a/bin/assets/movies/encantob0.png b/bin/assets/movies/encantob0.png
diff --git a/bin/assets/movies/encantop.png b/bin/assets/movies/encantop.png
diff --git a/bin/assets/movies/everything.png b/bin/assets/movies/everything.png
diff --git a/bin/assets/movies/everything1.png b/bin/assets/movies/everything1.png
diff --git a/bin/assets/movies/everything2.png b/bin/assets/movies/everything2.png
diff --git a/bin/assets/movies/everythingb.png b/bin/assets/movies/everythingb.png
diff --git a/bin/assets/movies/everythingp.png b/bin/assets/movies/everythingp.png
diff --git a/bin/assets/movies/home.png b/bin/assets/movies/home.png
diff --git a/bin/assets/movies/home1.png b/bin/assets/movies/home1.png
diff --git a/bin/assets/movies/home2.png b/bin/assets/movies/home2.png
diff --git a/bin/assets/movies/homeb.png b/bin/assets/movies/homeb.png
diff --git a/bin/assets/movies/homep.png b/bin/assets/movies/homep.png
diff --git a/bin/assets/movies/hp.png b/bin/assets/movies/hp.png
diff --git a/bin/assets/movies/hp1.png b/bin/assets/movies/hp1.png
diff --git a/bin/assets/movies/hp2.png b/bin/assets/movies/hp2.png
diff --git a/bin/assets/movies/hpb.png b/bin/assets/movies/hpb.png
diff --git a/bin/assets/movies/hpp.png b/bin/assets/movies/hpp.png
diff --git a/bin/assets/movies/nope.png b/bin/assets/movies/nope.png
diff --git a/bin/assets/movies/nope1.png b/bin/assets/movies/nope1.png
diff --git a/bin/assets/movies/nope2.png b/bin/assets/movies/nope2.png
diff --git a/bin/assets/movies/nopeb.png b/bin/assets/movies/nopeb.png
diff --git a/bin/assets/movies/nopep.png b/bin/assets/movies/nopep.png
diff --git a/bin/assets/movies/sw.png b/bin/assets/movies/sw.png
diff --git a/bin/assets/movies/sw1.png b/bin/assets/movies/sw1.png
diff --git a/bin/assets/movies/sw2.png b/bin/assets/movies/sw2.png
diff --git a/bin/assets/movies/swb.png b/bin/assets/movies/swb.png
diff --git a/bin/assets/movies/swp.png b/bin/assets/movies/swp.png
diff --git a/bin/assets/movies/tdk.png b/bin/assets/movies/tdk.png
diff --git a/bin/assets/movies/tdk1.png b/bin/assets/movies/tdk1.png
diff --git a/bin/assets/movies/tdk2.png b/bin/assets/movies/tdk2.png
diff --git a/bin/assets/movies/tdkb.png b/bin/assets/movies/tdkb.png
diff --git a/bin/assets/movies/tdkp.png b/bin/assets/movies/tdkp.png
diff --git a/bin/assets/nope.png b/bin/assets/nope.png
diff --git a/bin/assets/right.png b/bin/assets/right.png
diff --git a/bin/assets/watchlist.png b/bin/assets/watchlist.png
diff --git a/src/app.cpp b/src/app.cpp
@@ -17,7 +17,7 @@ void App::draw() {
     }
 
     // draw background
-    SETCOLOR(br.fill_color, 0.18f, 0.23f, 0.29f);
+    SETCOLOR(br.fill_color, 0.03f, 0.04f, 0.12f);
     br.fill_opacity = 1.0f;
     graphics::drawRect(CANVAS_WIDTH/2, CANVAS_HEIGHT/2, CANVAS_WIDTH, CANVAS_HEIGHT, br);
 
@@ -36,15 +36,49 @@ void App::update() {
         m_state = STATE_IDLE;
         return;
     }
+
+    for (auto w : m_widgets) {
+        w->update();
+    }
 }
 
 void App::init() {
+    // Initialize MovieDB object
+    MovieDB* mdb = MovieDB::getInstance();
+    mdb->init();
+
+    // Initialize components
     Sidebar* s = new Sidebar();
     m_widgets.push_front((Widget*) s);
     s->setPosX(CANVAS_WIDTH/12.0f);
     s->setPosY(CANVAS_HEIGHT/2.0f);
+    s->init();
+
+    HomeScreen* h = new HomeScreen();
+    m_widgets.push_front((Widget*) h);
+    h->setPosX(CANVAS_WIDTH * 7.0f/12.0f);
+    h->setPosY(CANVAS_HEIGHT/2.0f);
+    h->init();
+
+    BrowseScreen* b = new BrowseScreen();
+    m_widgets.push_front((Widget*) b);
+    b->setPosX(CANVAS_WIDTH * 7.0f/12.0f);
+    b->setPosY(CANVAS_HEIGHT/2.0f);
+    b->init();
+
+    InfoScreen* i = new InfoScreen();
+    m_widgets.push_front((Widget*) i);
+    i->setPosX(CANVAS_WIDTH * 7.0f/12.0f);
+    i->setPosY(CANVAS_HEIGHT/2.0f);
+
+    MovieScreen* m = new MovieScreen();
+    m_widgets.push_front((Widget*) m);
+    m->setPosX(CANVAS_WIDTH/2.0f);
+    m->setPosY(CANVAS_HEIGHT/2.0f);
+    m->init();
 
     graphics::preloadBitmaps(ASSET_PATH);
+    graphics::preloadBitmaps(MOVIE_PATH);
 }
 
 App::~App() {

diff --git a/src/app.h b/src/app.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <list>
-#include "widget.h"
+#include "widgets.h"
+#include "moviedb.h"
 
 class App {
 public:
@@ -10,15 +11,23 @@ class App {
 
     std::list<Widget*> m_widgets;
     app_state_t m_state = STATE_INIT;
+    std::string m_screen = "Home";
+    std::string m_prev_screen;
+    Movie* m_cur_movie = nullptr;
 
     App() {}
 public:
     void draw();
     void update();
     void init();
+    void setScreen(std::string s) { m_prev_screen = m_screen; m_screen = s; }
+    std::string getScreen() { return m_screen; }
+    std::string getPrevScreen() { return m_prev_screen; }
+    void setMovie(Movie* m) { m_cur_movie = m; }
+    Movie* getMovie() { return m_cur_movie; }
 
     ~App();
 
-    static void releaseInstance() { if (m_instance) delete m_instance; m_instance = nullptr; }
+    static void releaseInstance() { if (m_instance) {delete m_instance;} m_instance = nullptr; DB()->releaseInstance();}
     static App* getInstance();
 };
diff --git a/src/defines.h b/src/defines.h
@@ -13,9 +13,12 @@ inline void sleep(int ms) {
 #define CANVAS_HEIGHT 16.0f
 
 #define ASSET_PATH "assets/"
+#define MOVIE_PATH "assets/movies/"
 
 #define SETCOLOR(c, r, g, b) {c[0]=r; c[1]=g; c[2]=b;}
 #define RAND0TO1() (rand()/(float)RAND_MAX)
+#define APP() App::getInstance()
+#define DB() MovieDB::getInstance()
 
 inline float distance(float x1, float y1, float x2, float y2) {
     float dx = x1 - x2;