Initial sorting commit.

This is not perfect yet and still needs work.
This commit is contained in:
StackZ
2020-06-19 10:32:17 +02:00
parent c6f0798196
commit e8421ae69f
5 changed files with 349 additions and 32 deletions
+14
View File
@@ -29,6 +29,7 @@
#include "common.hpp"
#include "json.hpp"
#include "store.hpp"
#include "structs.hpp"
#include <citro2d.h>
@@ -41,12 +42,16 @@ public:
UniStoreV2(nlohmann::json &JSON, const std::string sheetPath);
~UniStoreV2();
private:
std::unique_ptr<Store> sortedStore;
bool darkMode = true, sheetLoaded = false, canDisplay = false, hasLoaded = false, isDropDown = false;
int selectedBox = 0, lastViewMode = 0, dropSelection = 0, iconAmount = 0, selectedBoxList = 0, selection = -1, storePage = 0, downloadPage = 0, storePageList = 0, mode = 0, subSelection = 0;
nlohmann::json storeJson;
C2D_SpriteSheet sheet;
std::vector<std::string> objects;
void DrawSortingMenu(void) const;
// Base stuff.
void DrawBaseTop(void) const;
void DrawBaseBottom(void) const;
@@ -98,6 +103,15 @@ private:
{5, 70, 140, 25} // Style.
};
const std::vector<Structs::ButtonPos> sortingPos = {
{40, 40, 100, 40}, // Descending.
{180, 40, 100, 40}, // Ascending.
// Now the actual options.
{115, 90, 100, 30}, // Title.
{115, 130, 100, 30}, // Author.
{115, 170, 100, 30} // Last Updated.
};
u32 barColorLight, barColorDark, bgColorLight, bgColorDark, textColorLight, textColorDark, boxColorLight, boxColorDark, outlineColorLight, outlineColorDark;
};
+81
View File
@@ -0,0 +1,81 @@
/*
* This file is part of Universal-Updater
* Copyright (C) 2019-2020 DeadPhoenix8091, Epicpkmn11, Flame, RocketRobz, StackZ, TotallyNotGuy
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Additional Terms 7.b and 7.c of GPLv3 apply to this file:
* * Requiring preservation of specified reasonable legal notices or
* author attributions in that material or in the Appropriate Legal
* Notices displayed by works containing it.
* * Prohibiting misrepresentation of the origin of that material,
* or requiring that modified versions of such material be marked in
* reasonable ways as different from the original version.
*/
#ifndef STORE_HPP
#define STORE_HPP
#include "json.hpp"
#include <3ds.h>
#include <string>
#include <vector>
struct UniStoreV2Struct {
std::string title;
std::string author;
std::string version;
std::string category;
std::string console;
std::string last_updated;
int icon_index;
int JSONIndex;
};
enum class SortType {
TITLE,
AUTHOR,
LAST_UPDATED
};
class Store {
public:
Store(nlohmann::json &JS);
void sorting(bool Ascending, SortType sorttype);
std::string returnTitle(const int index);
std::string returnAuthor(const int index);
int returnIconIndex(const int index);
int returnJSONIndex(const int index);
int getSize();
bool getAscending() { return this->ascending; }
const int getSortType() {
if (this->sorttype == SortType::TITLE) return 0;
else if (this->sorttype == SortType::AUTHOR) return 1;
else if (this->sorttype == SortType::LAST_UPDATED) return 2;
else return -1; // Should not happen.
}
private:
std::vector<UniStoreV2Struct> sortedStore, unsortedStore;
bool ascending = false;
nlohmann::json storeJson;
SortType sorttype = SortType::TITLE;
UniStoreV2Struct getData(const int index);
};
#endif