vyn/mirai
1
Fork 0
mirror of https://codeberg.org/vyn/mirai.git synced 2025-07-03 09:44:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ui changes, remove unused buttons

Browse source
This commit is contained in:
Vyn 2024-10-15 11:55:39 +02:00
parent 36a2fe9220
commit e28ba796cd
53 changed files with 133 additions and 27125 deletions
Download patch file Download diff file Expand all files Collapse all files

12
external/mirai-core/include/mirai-core/SourceDataProvider.h → external/mirai-core/include/mirai-core/DataProvider.h vendored
View file

@ -55,15 +55,15 @@ struct UpdatableEventData {
std::optional<Time> endsAt;
};
class SourceDataProvider
class DataProvider
{
public:
SourceDataProvider() {};
SourceDataProvider(SourceDataProvider &) = delete;
SourceDataProvider(SourceDataProvider &&) = delete;
DataProvider() {};
DataProvider(DataProvider &) = delete;
DataProvider(DataProvider &&) = delete;
virtual ~SourceDataProvider() = default;
virtual ~DataProvider() = default;
virtual void save() = 0;
virtual void load() = 0;
@ -95,7 +95,7 @@ class SourceDataProvider
virtual std::optional<DayData> getDayByDate(const Date &date) = 0;
virtual void updateDay(int dayId, UpdatableDayData updateData) = 0;
const int id = SourceDataProvider::generateNextId();
const int id = DataProvider::generateNextId();
void setDirty(bool dirty)
{

6
external/mirai-core/include/mirai-core/Day.h vendored
View file

@ -6,7 +6,7 @@
#pragma once
#include "SourceDataProvider.h"
#include "DataProvider.h"
#include <vector>
namespace mirai
@ -19,7 +19,7 @@ class Day
{
public:
Day(SourceDataProvider *data, DayData day) : data_(data), dayData_(day) {};
Day(DataProvider *data, DayData day) : data_(data), dayData_(day) {};
Date date() const;
std::vector<Task> tasks();
@ -32,7 +32,7 @@ class Day
private:
DayData dayData_;
SourceDataProvider *data_;
DataProvider *data_;
};
} // namespace mirai

6
external/mirai-core/include/mirai-core/Event.h vendored
View file

@ -6,8 +6,8 @@
#pragma once
#include "DataProvider.h"
#include "Day.h"
#include "SourceDataProvider.h"
#include <string>
#include <vector>
@ -20,7 +20,7 @@ class Event
{
public:
Event(SourceDataProvider *data, EventData eventData) : data_(data), eventData_(eventData) {};
Event(DataProvider *data, EventData eventData) : data_(data), eventData_(eventData) {};
std::string title() const;
Time startsAt() const;
@ -38,7 +38,7 @@ class Event
private:
EventData eventData_;
SourceDataProvider *data_;
DataProvider *data_;
};
} // namespace mirai

6
external/mirai-core/include/mirai-core/MarkdownDataProvider.h vendored
View file

@ -6,8 +6,8 @@
#pragma once
#include "DataProvider.h"
#include "DateTime.h"
#include "SourceDataProvider.h"
#include <algorithm>
#include <fstream>
#include <iterator>
@ -26,10 +26,10 @@ struct MarkdownData {
std::vector<EventData> events;
};
class MarkdownDataProvider : public SourceDataProvider
class MarkdownDataProvider : public DataProvider
{
public:
MarkdownDataProvider(const std::string &filePath) : filePath_(filePath), SourceDataProvider()
MarkdownDataProvider(const std::string &filePath) : filePath_(filePath), DataProvider()
{
}

5
external/mirai-core/include/mirai-core/Mirai.h vendored
View file

@ -19,11 +19,10 @@ class Mirai
{
public:
void loadSource(std::unique_ptr<SourceDataProvider> &&resource);
void loadSource(std::unique_ptr<DataProvider> &&resource);
void unloadAllSources();
void save();
std::optional<std::reference_wrapper<SourceDataProvider>>
getSourceByName(const std::string &name);
std::optional<std::reference_wrapper<DataProvider>> getSourceByName(const std::string &name);
std::vector<std::unique_ptr<Source>> &getSources();
const std::vector<std::string> &getTags();

6
external/mirai-core/include/mirai-core/Source.h vendored
View file

@ -6,10 +6,10 @@
#pragma once
#include "DataProvider.h"
#include "DateTime.h"
#include "Day.h"
#include "Event.h"
#include "SourceDataProvider.h"
#include "Task.h"
#include <string>
#include <vector>
@ -31,7 +31,7 @@ struct createEventParams {
};
struct SourceConstructor {
SourceDataProvider *sourceDataProvider;
DataProvider *sourceDataProvider;
};
class Source
@ -84,6 +84,6 @@ class Source
return nextId++;
}
SourceDataProvider *data;
DataProvider *data;
};
} // namespace mirai

8
external/mirai-core/include/mirai-core/Task.h vendored
View file

@ -6,8 +6,8 @@
#pragma once
#include "DataProvider.h"
#include "Event.h"
#include "SourceDataProvider.h"
#include <string>
namespace mirai
@ -19,14 +19,16 @@ class Task
{
public:
Task(SourceDataProvider *data, TaskData task) : data_(data), task_(task) {};
Task(DataProvider *data, TaskData task) : data_(data), task_(task) {};
std::string title() const;
mirai::TaskState state() const;
bool checked() const;
bool hasEvent() const;
void setTitle(const std::string &newTitle);
void setDay(const Day &day);
void setDate(const Date &date);
void setEvent(const Event &event);
void setChecked(bool checked);
@ -35,7 +37,7 @@ class Task
private:
TaskData task_;
SourceDataProvider *data_;
DataProvider *data_;
};
} // namespace mirai