refactor(layers/date): rename to date layer

This commit is contained in:
mikhail "synzr" 2025-10-18 16:58:03 +05:00
parent 1006274a5f
commit 1e600be872
4 changed files with 26 additions and 28 deletions

View file

@ -1,10 +0,0 @@
#ifndef BAR_LAYER_H_
#define BAR_LAYER_H_
#include <pebble.h>
void bar_layer_init(Layer *layer, int y);
void bar_layer_tick(void);
void bar_layer_deinit(void);
#endif

View file

@ -1,12 +1,11 @@
#include "bar_layer.h"
#include "date_layer.h"
#include "resources_service.h"
#define BAR_PAD_W 8
#define PAD_W 8
static Layer *s_bar_layer;
static Layer *s_date_layer;
static void bar_layer_update_proc(Layer *layer, GContext *ctx) {
static void date_layer_update_proc(Layer *layer, GContext *ctx) {
GRect window_rect = layer_get_unobstructed_bounds(layer);
time_t tmp = time(NULL);
@ -34,18 +33,18 @@ static void bar_layer_update_proc(Layer *layer, GContext *ctx) {
GTextAlignmentRight, NULL);
}
void bar_layer_init(Layer *layer, int y) {
void date_layer_init(Layer *layer, int y) {
GRect rect = layer_get_unobstructed_bounds(layer);
s_bar_layer = layer_create(GRect(BAR_PAD_W, y, rect.size.w - (BAR_PAD_W * 2), 28));
layer_set_update_proc(s_bar_layer, bar_layer_update_proc);
layer_add_child(layer, s_bar_layer);
s_date_layer = layer_create(GRect(PAD_W, y, rect.size.w - (PAD_W * 2), 28));
layer_set_update_proc(s_date_layer, date_layer_update_proc);
layer_add_child(layer, s_date_layer);
}
void bar_layer_tick(void) {
layer_mark_dirty(s_bar_layer);
void date_layer_tick(void) {
layer_mark_dirty(s_date_layer);
}
void bar_layer_deinit(void) {
layer_destroy(s_bar_layer);
void date_layer_deinit(void) {
layer_destroy(s_date_layer);
}

10
src/c/date_layer.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef DATE_LAYER_H_
#define DATE_LAYER_H_
#include <pebble.h>
void date_layer_init(Layer *layer, int y);
void date_layer_tick(void);
void date_layer_deinit(void);
#endif // DATE_LAYER_H_

View file

@ -1,13 +1,12 @@
#include "main_window.h"
#include "bar_layer.h"
#include "date_layer.h"
#include "character_layer.h"
#include "clock_layer.h"
static Window *s_main_window;
static void main_window_tick(struct tm *time, TimeUnits units) {
bar_layer_tick();
date_layer_tick();
clock_layer_tick();
character_layer_tick();
}
@ -15,7 +14,7 @@ static void main_window_tick(struct tm *time, TimeUnits units) {
static void main_window_load(Window *window) {
Layer *layer = window_get_root_layer(window);
bar_layer_init(layer, 0);
date_layer_init(layer, 0);
clock_layer_init(layer, 40);
character_layer_init(layer);
@ -26,7 +25,7 @@ static void main_window_unload(Window *window) {
tick_timer_service_unsubscribe();
clock_layer_deinit();
bar_layer_deinit();
date_layer_deinit();
character_layer_deinit();
}