diff --git a/.github/apk-badge.png b/.github/apk-badge.png new file mode 100644 index 00000000..5d112c2f Binary files /dev/null and b/.github/apk-badge.png differ diff --git a/.github/google-play-badge.png b/.github/google-play-badge.png new file mode 100644 index 00000000..7da103b5 Binary files /dev/null and b/.github/google-play-badge.png differ diff --git a/.github/readme-banner.png b/.github/readme-banner.png new file mode 100644 index 00000000..03e78742 Binary files /dev/null and b/.github/readme-banner.png differ diff --git a/.github/utils/.gitignore b/.github/utils/.gitignore new file mode 100644 index 00000000..d50a09fc --- /dev/null +++ b/.github/utils/.gitignore @@ -0,0 +1,2 @@ +.env +__pycache__/ diff --git a/.github/utils/_get_password.py b/.github/utils/_get_password.py new file mode 100644 index 00000000..33071b6c --- /dev/null +++ b/.github/utils/_get_password.py @@ -0,0 +1,57 @@ +import base64 +import secrets +from hashlib import sha256 +from typing import Tuple + +import mysql.connector as mysql +from Crypto.Cipher import AES + + +def get_password( + version_name: str, + version_code: int, + db_host: str, + db_user: str, + db_pass: str, + db_name: str, +) -> Tuple[str, bytes]: + db = mysql.connect( + host=db_host, + user=db_user, + password=db_pass, + database=db_name, + auth_plugin="mysql_native_password", + ) + + print(f"Generating passwords for version {version_name} ({version_code})") + + password = base64.b64encode(secrets.token_bytes(16)).decode() + iv = secrets.token_bytes(16) + + key = f"{version_name}.{password}.{version_code}" + key = sha256(key.encode()).digest() + data = "ThisIsOurHardWorkPleaseDoNotCopyOrSteal(c)2019.KubaSz" + data = sha256(data.encode()).digest() + data = data + (chr(16) * 16).encode() + + aes = AES.new(key=key, mode=AES.MODE_CBC, iv=iv) + + app_password = base64.b64encode(aes.encrypt(data)).decode() + + c = db.cursor() + c.execute( + "INSERT IGNORE INTO _appPasswords (versionCode, appPassword, password, iv) VALUES (%s, %s, %s, %s);", + (version_code, app_password, password, iv), + ) + db.commit() + + c = db.cursor() + c.execute( + "SELECT password, iv FROM _appPasswords WHERE versionCode = %s;", + (version_code,), + ) + row = c.fetchone() + + db.close() + + return (row[0], row[1]) diff --git a/.github/utils/_utils.py b/.github/utils/_utils.py new file mode 100644 index 00000000..09b59f4a --- /dev/null +++ b/.github/utils/_utils.py @@ -0,0 +1,142 @@ +import re +import subprocess +import sys +from datetime import datetime +from typing import Tuple + +VERSION_NAME_REGEX = r'versionName: "(.+?)"' +VERSION_CODE_REGEX = r"versionCode: ([0-9]+)" +VERSION_NAME_FORMAT = 'versionName: "{}"' +VERSION_CODE_FORMAT = "versionCode: {}" + + +def get_project_dir() -> str: + project_dir = sys.argv[1] + if project_dir[-1:] == "/" or project_dir[-1:] == "\\": + project_dir = project_dir[:-1] + return project_dir + + +def read_gradle_version(project_dir: str) -> Tuple[int, str]: + GRADLE_PATH = f"{project_dir}/build.gradle" + + with open(GRADLE_PATH, "r") as f: + gradle = f.read() + + version_name = re.search(VERSION_NAME_REGEX, gradle).group(1) + version_code = int(re.search(VERSION_CODE_REGEX, gradle).group(1)) + + return (version_code, version_name) + + +def write_gradle_version(project_dir: str, version_code: int, version_name: str): + GRADLE_PATH = f"{project_dir}/build.gradle" + + with open(GRADLE_PATH, "r") as f: + gradle = f.read() + + gradle = re.sub( + VERSION_NAME_REGEX, VERSION_NAME_FORMAT.format(version_name), gradle + ) + gradle = re.sub( + VERSION_CODE_REGEX, VERSION_CODE_FORMAT.format(version_code), gradle + ) + + with open(GRADLE_PATH, "w") as f: + f.write(gradle) + + +def build_version_code(version_name: str) -> int: + version = version_name.split("+")[0].split("-") + version_base = version[0] + version_suffix = version[1] if len(version) == 2 else "" + + base_parts = version_base.split(".") + major = int(base_parts[0]) or 0 + minor = int(base_parts[1]) if len(base_parts) > 1 else 0 + patch = int(base_parts[2]) if len(base_parts) > 2 else 0 + + beta = 9 + rc = 9 + if "dev" in version_suffix: + beta = 0 + rc = 0 + elif "beta." in version_suffix: + beta = int(version_suffix.split(".")[1]) + rc = 0 + elif "rc." in version_suffix: + beta = 0 + rc = int(version_suffix.split(".")[1]) + + version_code = beta + rc * 10 + patch * 100 + minor * 10000 + major * 1000000 + return version_code + + +def get_changelog(project_dir: str, format: str) -> Tuple[str, str]: + with open( + f"{project_dir}/app/src/main/assets/pl-changelog.html", "r", encoding="utf-8" + ) as f: + changelog = f.read() + + title = re.search(r"

(.+?)

", changelog).group(1) + content = re.search(r"(?s)", changelog).group(1).strip() + content = "\n".join(line.strip() for line in content.split("\n")) + + if format != "html": + content = content.replace("
  • ", "- ") + content = content.replace("
    ", "\n") + if format == "markdown": + content = re.sub(r"(.+?)", "__\\1__", content) + content = re.sub(r"(.+?)", "*\\1*", content) + content = re.sub(r"(.+?)", "**\\1**", content) + content = re.sub(r"", "", content) + + return (title, content) + + +def get_commit_log(project_dir: str, format: str, max_lines: int = None) -> str: + last_tag = ( + subprocess.check_output("git describe --tags --abbrev=0".split(" ")) + .decode() + .strip() + ) + + log = subprocess.run( + args=f"git log {last_tag}..HEAD --format=%an%x00%at%x00%h%x00%s%x00%D".split(" "), + cwd=project_dir, + stdout=subprocess.PIPE, + ) + log = log.stdout.strip().decode() + + commits = [line.split("\x00") for line in log.split("\n")] + if max_lines: + commits = commits[:max_lines] + + output = [] + valid = False + + for commit in commits: + if not commit[0]: + continue + if "origin/" in commit[4]: + valid = True + if not valid: + continue + date = datetime.fromtimestamp(float(commit[1])) + date = date.strftime("%Y-%m-%d %H:%M:%S") + if format == "html": + output.append(f"
  • {commit[3]} - {commit[0]}
    • ") + elif format == "markdown": + output.append(f"[{date}] {commit[0]}\n {commit[3]}") + elif format == "markdown_full": + output.append( + f"_[{date}] {commit[0]}_\n` `__`{commit[2]}`__ **{commit[3]}**" + ) + elif format == "plain": + output.append(f"- {commit[3]}") + + if format == "markdown": + output.insert(0, "```") + output.append("```") + + return "\n".join(output) diff --git a/.github/utils/bump_nightly.py b/.github/utils/bump_nightly.py new file mode 100644 index 00000000..88b4798c --- /dev/null +++ b/.github/utils/bump_nightly.py @@ -0,0 +1,69 @@ +import json +import os +import re +import sys +from datetime import datetime, timedelta + +import requests + +from _utils import ( + get_commit_log, + get_project_dir, + read_gradle_version, + write_gradle_version, +) + +if __name__ == "__main__": + if len(sys.argv) < 2: + print("usage: bump_nightly.py ") + exit(-1) + + repo = os.getenv("GITHUB_REPOSITORY") + sha = os.getenv("GITHUB_SHA") + + if not repo or not sha: + print("Missing GitHub environment variables.") + exit(-1) + + with requests.get( + f"https://api.github.com/repos/{repo}/actions/runs?per_page=5&status=success" + ) as r: + data = json.loads(r.text) + runs = [run for run in data["workflow_runs"] if run["head_sha"] == sha] + if runs: + print("::set-output name=hasNewChanges::false") + exit(0) + + print("::set-output name=hasNewChanges::true") + + project_dir = get_project_dir() + + (version_code, version_name) = read_gradle_version(project_dir) + version_name = version_name.split("+")[0] + + date = datetime.now() + if date.hour > 6: + version_name += "+daily." + date.strftime("%Y%m%d-%H%M") + else: + date -= timedelta(days=1) + version_name += "+nightly." + date.strftime("%Y%m%d") + + print("::set-output name=appVersionName::" + version_name) + print("::set-output name=appVersionCode::" + str(version_code)) + + write_gradle_version(project_dir, version_code, version_name) + + commit_log = get_commit_log(project_dir, format="html", max_lines=10) + + with open( + f"{project_dir}/app/src/main/assets/pl-changelog.html", "r", encoding="utf-8" + ) as f: + changelog = f.read() + + changelog = re.sub(r"

    (.+?)

    ", f"

    {version_name}

    ", changelog) + changelog = re.sub(r"(?s)", f"", changelog) + + with open( + f"{project_dir}/app/src/main/assets/pl-changelog.html", "w", encoding="utf-8" + ) as f: + f.write(changelog) diff --git a/.github/utils/bump_version.py b/.github/utils/bump_version.py new file mode 100644 index 00000000..80d36519 --- /dev/null +++ b/.github/utils/bump_version.py @@ -0,0 +1,41 @@ +import os + +from dotenv import load_dotenv + +from _get_password import get_password +from _utils import build_version_code, write_gradle_version +from sign import sign + +if __name__ == "__main__": + version_name = input("Enter version name: ") + version_code = build_version_code(version_name) + + print(f"Bumping version to {version_name} ({version_code})") + + project_dir = "../.." + + load_dotenv() + DB_HOST = os.getenv("DB_HOST") + DB_USER = os.getenv("DB_USER") + DB_PASS = os.getenv("DB_PASS") + DB_NAME = os.getenv("DB_NAME") + + write_gradle_version(project_dir, version_code, version_name) + (password, iv) = get_password( + version_name, version_code, DB_HOST, DB_USER, DB_PASS, DB_NAME + ) + + sign(project_dir, version_name, version_code, password, iv, commit=False) + + print("Writing mock passwords") + os.chdir(project_dir) + os.system( + "sed -i -E 's/\/\*([0-9a-f]{2} ?){16}\*\//\/*secret password - removed for source code publication*\//g' app/src/main/cpp/szkolny-signing.cpp" + ) + os.system( + "sed -i -E 's/\\t0x.., 0x(.)., 0x.(.), 0x.(.), 0x.., 0x.., 0x.., 0x.(.), 0x.., 0x.(.), 0x(.)., 0x(.)., 0x.., 0x.., 0x.., 0x.(.)/\\t0x\\3\\6, 0x\\7\\4, 0x\\1\\8, 0x\\2\\5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff /g' app/src/main/cpp/szkolny-signing.cpp" + ) + os.system( + "sed -i -E 's/param1\..(.).(.).(.).(.)..(.)..(.)..(.)..(.).../param1.MTIzNDU2Nzg5MD\\5\\2\\7\\6\\1\\3\\4\8==/g' app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt" + ) + input("Press any key to finish") diff --git a/.github/utils/extract_changelogs.py b/.github/utils/extract_changelogs.py new file mode 100644 index 00000000..25d346c1 --- /dev/null +++ b/.github/utils/extract_changelogs.py @@ -0,0 +1,72 @@ +import os +import sys + +from _utils import get_changelog, get_commit_log, get_project_dir, read_gradle_version + +if __name__ == "__main__": + if len(sys.argv) < 2: + print("usage: extract_changelogs.py ") + exit(-1) + + project_dir = get_project_dir() + + (version_code, version_name) = read_gradle_version(project_dir) + + print("::set-output name=appVersionName::" + version_name) + print("::set-output name=appVersionCode::" + str(version_code)) + + dir = f"{project_dir}/app/release/whatsnew-{version_name}/" + os.makedirs(dir, exist_ok=True) + + print("::set-output name=changelogDir::" + dir) + + (title, changelog) = get_changelog(project_dir, format="plain") + + # plain text changelog - Firebase App Distribution + with open(dir + "whatsnew-titled.txt", "w", encoding="utf-8") as f: + f.write(title) + f.write("\n") + f.write(changelog) + print("::set-output name=changelogPlainTitledFile::" + dir + "whatsnew-titled.txt") + + print("::set-output name=changelogTitle::" + title) + + # plain text changelog, max 500 chars - Google Play + with open(dir + "whatsnew-pl-PL", "w", encoding="utf-8") as f: + changelog_lines = changelog.split("\n") + changelog = "" + for line in changelog_lines: + if len(changelog) + len(line) < 500: + changelog += "\n" + line + changelog = changelog.strip() + f.write(changelog) + + print("::set-output name=changelogPlainFile::" + dir + "whatsnew-pl-PL") + + # markdown changelog - Discord webhook + (_, changelog) = get_changelog(project_dir, format="markdown") + with open(dir + "whatsnew.md", "w", encoding="utf-8") as f: + f.write(changelog) + print("::set-output name=changelogMarkdownFile::" + dir + "whatsnew.md") + + # html changelog - version info in DB + (_, changelog) = get_changelog(project_dir, format="html") + with open(dir + "whatsnew.html", "w", encoding="utf-8") as f: + f.write(changelog) + print("::set-output name=changelogHtmlFile::" + dir + "whatsnew.html") + + + changelog = get_commit_log(project_dir, format="plain", max_lines=10) + with open(dir + "commit_log.txt", "w", encoding="utf-8") as f: + f.write(changelog) + print("::set-output name=commitLogPlainFile::" + dir + "commit_log.txt") + + changelog = get_commit_log(project_dir, format="markdown", max_lines=10) + with open(dir + "commit_log.md", "w", encoding="utf-8") as f: + f.write(changelog) + print("::set-output name=commitLogMarkdownFile::" + dir + "commit_log.md") + + changelog = get_commit_log(project_dir, format="html", max_lines=10) + with open(dir + "commit_log.html", "w", encoding="utf-8") as f: + f.write(changelog) + print("::set-output name=commitLogHtmlFile::" + dir + "commit_log.html") diff --git a/.github/utils/rename_artifacts.py b/.github/utils/rename_artifacts.py new file mode 100644 index 00000000..4eeabfaf --- /dev/null +++ b/.github/utils/rename_artifacts.py @@ -0,0 +1,26 @@ +import glob +import os +import sys + +from _utils import get_project_dir + +if __name__ == "__main__": + if len(sys.argv) < 2: + print("usage: rename_artifacts.py ") + exit(-1) + + project_dir = get_project_dir() + + files = glob.glob(f"{project_dir}/app/release/*.*") + for file in files: + file_relative = file.replace(os.getenv("GITHUB_WORKSPACE") + "/", "") + if "-aligned.apk" in file: + os.unlink(file) + elif "-signed.apk" in file: + new_file = file.replace("-signed.apk", ".apk") + if os.path.isfile(new_file): + os.unlink(new_file) + os.rename(file, new_file) + elif ".apk" in file or ".aab" in file: + print("::set-output name=signedReleaseFile::" + file) + print("::set-output name=signedReleaseFileRelative::" + file_relative) diff --git a/.github/utils/save_version.py b/.github/utils/save_version.py new file mode 100644 index 00000000..01de17a7 --- /dev/null +++ b/.github/utils/save_version.py @@ -0,0 +1,122 @@ +import glob +import os +import sys +from datetime import datetime +from time import time + +import mysql.connector as mysql +from dotenv import load_dotenv + +from _utils import get_changelog, get_commit_log, get_project_dir, read_gradle_version + + +def save_version( + project_dir: str, + db_host: str, + db_user: str, + db_pass: str, + db_name: str, + apk_server_release: str, + apk_server_nightly: str, +): + db = mysql.connect( + host=db_host, + user=db_user, + password=db_pass, + database=db_name, + auth_plugin="mysql_native_password", + ) + + (version_code, version_name) = read_gradle_version(project_dir) + (_, changelog) = get_changelog(project_dir, format="html") + + types = ["dev", "beta", "nightly", "daily", "rc", "release"] + build_type = [x for x in types if x in version_name] + build_type = build_type[0] if build_type else "release" + + if "+nightly." in version_name or "+daily." in version_name: + changelog = get_commit_log(project_dir, format="html") + build_type = "nightly" + elif "-dev" in version_name: + build_type = "dev" + elif "-beta." in version_name: + build_type = "beta" + elif "-rc." in version_name: + build_type = "rc" + + build_date = int(time()) + apk_name = None + bundle_name_play = None + + files = glob.glob(f"{project_dir}/app/release/*.*") + output_apk = f"Edziennik_{version_name}_official.apk" + output_aab_play = f"Edziennik_{version_name}_play.aab" + for file in files: + if output_apk in file: + build_date = int(os.stat(file).st_mtime) + apk_name = output_apk + if output_aab_play in file: + build_date = int(os.stat(file).st_mtime) + bundle_name_play = output_aab_play + + build_date = datetime.fromtimestamp(build_date).strftime("%Y-%m-%d %H:%M:%S") + + if build_type in ["nightly", "daily"]: + download_url = apk_server_nightly + apk_name if apk_name else None + else: + download_url = apk_server_release + apk_name if apk_name else None + + cols = [ + "versionCode", + "versionName", + "releaseDate", + "releaseNotes", + "releaseType", + "downloadUrl", + "apkName", + "bundleNamePlay", + ] + updated = { + "versionCode": version_code, + "downloadUrl": download_url, + "apkName": apk_name, + "bundleNamePlay": bundle_name_play, + } + + values = [ + version_code, + version_name, + build_date, + changelog, + build_type, + download_url, + apk_name, + bundle_name_play, + ] + values.extend(val for val in updated.values() if val) + + updated = ", ".join(f"{col} = %s" for (col, val) in updated.items() if val) + + sql = f"INSERT INTO updates ({', '.join(cols)}) VALUES ({'%s, ' * (len(cols) - 1)}%s) ON DUPLICATE KEY UPDATE {updated};" + + c = db.cursor() + c.execute(sql, tuple(values)) + db.commit() + + +if __name__ == "__main__": + if len(sys.argv) < 2: + print("usage: save_version.py ") + exit(-1) + + project_dir = get_project_dir() + + load_dotenv() + DB_HOST = os.getenv("DB_HOST") + DB_USER = os.getenv("DB_USER") + DB_PASS = os.getenv("DB_PASS") + DB_NAME = os.getenv("DB_NAME") + APK_SERVER_RELEASE = os.getenv("APK_SERVER_RELEASE") + APK_SERVER_NIGHTLY = os.getenv("APK_SERVER_NIGHTLY") + + save_version(project_dir, DB_HOST, DB_USER, DB_PASS, DB_NAME, APK_SERVER_RELEASE, APK_SERVER_NIGHTLY) diff --git a/.github/utils/sign.py b/.github/utils/sign.py new file mode 100644 index 00000000..026d819b --- /dev/null +++ b/.github/utils/sign.py @@ -0,0 +1,84 @@ +import os +import re +import sys + +from dotenv import load_dotenv + +from _get_password import get_password +from _utils import get_project_dir, read_gradle_version + + +def sign( + project_dir: str, + version_name: str, + version_code: int, + password: str, + iv: bytes, + commit: bool = False, +): + SIGNING_PATH = f"{project_dir}/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt" + CPP_PATH = f"{project_dir}/app/src/main/cpp/szkolny-signing.cpp" + + with open(SIGNING_PATH, "r") as f: + signing = f.read() + + with open(CPP_PATH, "r") as f: + cpp = f.read() + + SIGNING_REGEX = r"\$param1\..*\.\$param2" + CPP_REGEX = r"(?s)/\*.+?toys AES_IV\[16\] = {.+?};" + + SIGNING_FORMAT = "$param1.{}.$param2" + CPP_FORMAT = "/*{}*/\nstatic toys AES_IV[16] = {{\n\t{} }};" + + print(f"Writing passwords for version {version_name} ({version_code})") + + iv_hex = " ".join(["{:02x}".format(x) for x in iv]) + iv_cpp = ", ".join(["0x{:02x}".format(x) for x in iv]) + + signing = re.sub(SIGNING_REGEX, SIGNING_FORMAT.format(password), signing) + cpp = re.sub(CPP_REGEX, CPP_FORMAT.format(iv_hex, iv_cpp), cpp) + + with open(SIGNING_PATH, "w") as f: + f.write(signing) + + with open(CPP_PATH, "w") as f: + f.write(cpp) + + if commit: + os.chdir(project_dir) + os.system("git add .") + os.system( + f'git commit -m "[{version_name}] Update build.gradle, signing and changelog."' + ) + + +if __name__ == "__main__": + if len(sys.argv) < 2: + print("usage: sign.py [commit]") + exit(-1) + + project_dir = get_project_dir() + + load_dotenv() + DB_HOST = os.getenv("DB_HOST") + DB_USER = os.getenv("DB_USER") + DB_PASS = os.getenv("DB_PASS") + DB_NAME = os.getenv("DB_NAME") + + (version_code, version_name) = read_gradle_version(project_dir) + (password, iv) = get_password( + version_name, version_code, DB_HOST, DB_USER, DB_PASS, DB_NAME + ) + + print("::set-output name=appVersionName::" + version_name) + print("::set-output name=appVersionCode::" + str(version_code)) + + sign( + project_dir, + version_name, + version_code, + password, + iv, + commit="commit" in sys.argv, + ) diff --git a/.github/utils/webhook_discord.py b/.github/utils/webhook_discord.py new file mode 100644 index 00000000..3c1404ae --- /dev/null +++ b/.github/utils/webhook_discord.py @@ -0,0 +1,118 @@ +import os +import sys +from datetime import datetime + +import requests +from dotenv import load_dotenv + +from _utils import get_changelog, get_commit_log, get_project_dir, read_gradle_version + + +def post_webhook( + project_dir: str, + apk_file: str, + apk_server_release: str, + apk_server_nightly: str, + webhook_release: str, + webhook_testing: str, +): + (_, version_name) = read_gradle_version(project_dir) + + types = ["dev", "beta", "nightly", "daily", "rc", "release"] + build_type = [x for x in types if x in version_name] + build_type = build_type[0] if build_type else None + + testing = ["dev", "beta", "nightly", "daily"] + testing = build_type in testing + + apk_name = os.path.basename(apk_file) + if build_type in ["nightly", "daily"]: + download_url = apk_server_nightly + apk_name + else: + download_url = apk_server_release + apk_name + + if testing: + build_date = int(os.stat(apk_file).st_mtime) + if build_date: + build_date = datetime.fromtimestamp(build_date).strftime("%Y-%m-%d %H:%M") + + # untagged release, get commit log + if build_type in ["nightly", "daily"]: + changelog = get_commit_log(project_dir, format="markdown", max_lines=5) + else: + changelog = get_changelog(project_dir, format="markdown") + + webhook = get_webhook_testing( + version_name, build_type, changelog, download_url, build_date + ) + requests.post(url=webhook_testing, json=webhook) + else: + changelog = get_changelog(project_dir, format="markdown") + webhook = get_webhook_release(changelog, download_url) + requests.post(url=webhook_release, json=webhook) + + +def get_webhook_release(changelog: str, download_url: str): + (title, content) = changelog + return {"content": f"__**{title}**__\n{content}\n{download_url}"} + + +def get_webhook_testing( + version_name: str, + build_type: str, + changelog: str, + download_url: str, + build_date: str, +): + return { + "embeds": [ + { + "title": f"Nowa wersja {build_type} aplikacji Szkolny.eu", + "description": f"Dostępna jest nowa wersja testowa **{build_type}**.", + "color": 2201331, + "fields": [ + { + "name": f"Wersja `{version_name}`", + "value": f"[Pobierz .APK]({download_url})" + if download_url + else "*Pobieranie niedostępne*", + "inline": False, + }, + { + "name": "Data kompilacji", + "value": build_date or "-", + "inline": False, + }, + { + "name": "Ostatnie zmiany", + "value": changelog or "-", + "inline": False, + }, + ], + } + ] + } + + +if __name__ == "__main__": + if len(sys.argv) < 2: + print("usage: webhook_discord.py ") + exit(-1) + + project_dir = get_project_dir() + + load_dotenv() + APK_FILE = os.getenv("APK_FILE") + APK_SERVER_RELEASE = os.getenv("APK_SERVER_RELEASE") + APK_SERVER_NIGHTLY = os.getenv("APK_SERVER_NIGHTLY") + WEBHOOK_RELEASE = os.getenv("WEBHOOK_RELEASE") + WEBHOOK_TESTING = os.getenv("WEBHOOK_TESTING") + + post_webhook( + project_dir, + APK_FILE, + APK_SERVER_RELEASE, + APK_SERVER_NIGHTLY, + WEBHOOK_RELEASE, + WEBHOOK_TESTING, + ) diff --git a/.github/workflows/build-nightly-apk.yml b/.github/workflows/build-nightly-apk.yml new file mode 100644 index 00000000..c64dba12 --- /dev/null +++ b/.github/workflows/build-nightly-apk.yml @@ -0,0 +1,153 @@ +name: Nightly build + +on: + schedule: + # 23:30 UTC, 0:30 or 1:30 CET/CEST + - cron: "30 23 * * *" + workflow_dispatch: + +jobs: + prepare: + name: Prepare build environment + runs-on: self-hosted + outputs: + hasNewChanges: ${{ steps.nightly.outputs.hasNewChanges }} + steps: + - name: Checkout repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 + clean: false + - name: Set executable permissions to gradlew + run: chmod +x ./gradlew + - name: Setup Python + uses: actions/setup-python@v2 + - name: Install packages + uses: BSFishy/pip-action@v1 + with: + packages: | + python-dotenv + pycryptodome + mysql-connector-python + requests + - name: Bump nightly version + id: nightly + run: python $GITHUB_WORKSPACE/.github/utils/bump_nightly.py $GITHUB_WORKSPACE + - name: Write signing passwords + if: steps.nightly.outputs.hasNewChanges + env: + DB_HOST: ${{ secrets.DB_HOST }} + DB_USER: ${{ secrets.DB_USER }} + DB_PASS: ${{ secrets.DB_PASS }} + DB_NAME: ${{ secrets.DB_NAME }} + run: python $GITHUB_WORKSPACE/.github/utils/sign.py $GITHUB_WORKSPACE commit + build: + name: Build APK + runs-on: self-hosted + needs: + - prepare + if: ${{ needs.prepare.outputs.hasNewChanges == 'true' }} + outputs: + androidHome: ${{ env.ANDROID_HOME }} + androidSdkRoot: ${{ env.ANDROID_SDK_ROOT }} + steps: + - name: Setup JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: '11' + cache: 'gradle' + - name: Setup Android SDK + uses: android-actions/setup-android@v2 + - name: Clean build artifacts + run: | + rm -rf app/release/* + rm -rf app/build/outputs/apk/* + rm -rf app/build/outputs/bundle/* + - name: Assemble official release with Gradle + run: ./gradlew assembleOfficialRelease + sign: + name: Sign APK + runs-on: self-hosted + needs: + - build + outputs: + signedReleaseFile: ${{ steps.artifacts.outputs.signedReleaseFile }} + signedReleaseFileRelative: ${{ steps.artifacts.outputs.signedReleaseFileRelative }} + steps: + - name: Sign build artifacts + id: sign_app + uses: r0adkll/sign-android-release@v1 + with: + releaseDirectory: app/release + signingKeyBase64: ${{ secrets.KEY_STORE }} + alias: ${{ secrets.KEY_ALIAS }} + keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.KEY_ALIAS_PASSWORD }} + env: + ANDROID_HOME: ${{ needs.build.outputs.androidHome }} + ANDROID_SDK_ROOT: ${{ needs.build.outputs.androidSdkRoot }} + BUILD_TOOLS_VERSION: "30.0.2" + - name: Rename signed artifacts + id: artifacts + run: python $GITHUB_WORKSPACE/.github/utils/rename_artifacts.py $GITHUB_WORKSPACE + publish: + name: Publish APK + runs-on: self-hosted + needs: + - sign + steps: + - name: Setup Python + uses: actions/setup-python@v2 + + - name: Extract changelogs + id: changelog + run: python $GITHUB_WORKSPACE/.github/utils/extract_changelogs.py $GITHUB_WORKSPACE + + - name: Upload APK to SFTP + uses: easingthemes/ssh-deploy@v2.1.6 + env: + REMOTE_HOST: ${{ secrets.SSH_IP }} + REMOTE_USER: ${{ secrets.SSH_USERNAME }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_KEY }} + SOURCE: ${{ needs.sign.outputs.signedReleaseFileRelative }} + TARGET: ${{ secrets.SSH_PATH_NIGHTLY }} + - name: Save version metadata + env: + DB_HOST: ${{ secrets.DB_HOST }} + DB_USER: ${{ secrets.DB_USER }} + DB_PASS: ${{ secrets.DB_PASS }} + DB_NAME: ${{ secrets.DB_NAME }} + APK_SERVER_RELEASE: ${{ secrets.APK_SERVER_RELEASE }} + APK_SERVER_NIGHTLY: ${{ secrets.APK_SERVER_NIGHTLY }} + run: python $GITHUB_WORKSPACE/.github/utils/save_version.py $GITHUB_WORKSPACE + + - name: Distribute to App Distribution + uses: wzieba/Firebase-Distribution-Github-Action@v1 + with: + appId: ${{ secrets.FIREBASE_APP_ID }} + token: ${{ secrets.FIREBASE_TOKEN }} + groups: ${{ secrets.FIREBASE_GROUPS_NIGHTLY }} + file: ${{ needs.sign.outputs.signedReleaseFile }} + releaseNotesFile: ${{ steps.changelog.outputs.commitLogPlainFile }} + + - name: Post Discord webhook + env: + APK_FILE: ${{ needs.sign.outputs.signedReleaseFile }} + APK_SERVER_RELEASE: ${{ secrets.APK_SERVER_RELEASE }} + APK_SERVER_NIGHTLY: ${{ secrets.APK_SERVER_NIGHTLY }} + WEBHOOK_RELEASE: ${{ secrets.WEBHOOK_RELEASE }} + WEBHOOK_TESTING: ${{ secrets.WEBHOOK_TESTING }} + run: python $GITHUB_WORKSPACE/.github/utils/webhook_discord.py $GITHUB_WORKSPACE + + - name: Upload workflow artifact + uses: actions/upload-artifact@v2 + if: true + with: + name: ${{ steps.changelog.outputs.appVersionName }} + path: | + app/release/whatsnew*/ + app/release/*.apk + app/release/*.aab + app/release/*.json + app/release/*.txt diff --git a/.github/workflows/build-release-aab-play.yml b/.github/workflows/build-release-aab-play.yml new file mode 100644 index 00000000..5f3026e6 --- /dev/null +++ b/.github/workflows/build-release-aab-play.yml @@ -0,0 +1,130 @@ +name: Release build - Google Play [AAB] + +on: + push: + branches: + - "master" + +jobs: + prepare: + name: Prepare build environment + runs-on: self-hosted + steps: + - name: Checkout repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 + clean: false + - name: Set executable permissions to gradlew + run: chmod +x ./gradlew + - name: Setup Python + uses: actions/setup-python@v2 + - name: Install packages + uses: BSFishy/pip-action@v1 + with: + packages: | + python-dotenv + pycryptodome + mysql-connector-python + requests + - name: Write signing passwords + env: + DB_HOST: ${{ secrets.DB_HOST }} + DB_USER: ${{ secrets.DB_USER }} + DB_PASS: ${{ secrets.DB_PASS }} + DB_NAME: ${{ secrets.DB_NAME }} + run: python $GITHUB_WORKSPACE/.github/utils/sign.py $GITHUB_WORKSPACE commit + build: + name: Build App Bundle + runs-on: self-hosted + needs: + - prepare + outputs: + androidHome: ${{ env.ANDROID_HOME }} + androidSdkRoot: ${{ env.ANDROID_SDK_ROOT }} + steps: + - name: Setup JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: '11' + cache: 'gradle' + - name: Setup Android SDK + uses: android-actions/setup-android@v2 + - name: Clean build artifacts + run: | + rm -rf app/release/* + rm -rf app/build/outputs/apk/* + rm -rf app/build/outputs/bundle/* + - name: Bundle play release with Gradle + run: ./gradlew bundlePlayRelease + sign: + name: Sign App Bundle + runs-on: self-hosted + needs: + - build + outputs: + signedReleaseFile: ${{ steps.artifacts.outputs.signedReleaseFile }} + signedReleaseFileRelative: ${{ steps.artifacts.outputs.signedReleaseFileRelative }} + steps: + - name: Sign build artifacts + id: sign_app + uses: r0adkll/sign-android-release@v1 + with: + releaseDirectory: app/release + signingKeyBase64: ${{ secrets.KEY_STORE }} + alias: ${{ secrets.KEY_ALIAS }} + keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.KEY_ALIAS_PASSWORD }} + env: + ANDROID_HOME: ${{ needs.build.outputs.androidHome }} + ANDROID_SDK_ROOT: ${{ needs.build.outputs.androidSdkRoot }} + BUILD_TOOLS_VERSION: "30.0.2" + - name: Rename signed artifacts + id: artifacts + run: python $GITHUB_WORKSPACE/.github/utils/rename_artifacts.py $GITHUB_WORKSPACE + publish: + name: Publish App Bundle + runs-on: self-hosted + needs: + - sign + steps: + - name: Setup Python + uses: actions/setup-python@v2 + + - name: Extract changelogs + id: changelog + run: python $GITHUB_WORKSPACE/.github/utils/extract_changelogs.py $GITHUB_WORKSPACE + + - name: Save version metadata + env: + DB_HOST: ${{ secrets.DB_HOST }} + DB_USER: ${{ secrets.DB_USER }} + DB_PASS: ${{ secrets.DB_PASS }} + DB_NAME: ${{ secrets.DB_NAME }} + APK_SERVER_RELEASE: ${{ secrets.APK_SERVER_RELEASE }} + APK_SERVER_NIGHTLY: ${{ secrets.APK_SERVER_NIGHTLY }} + run: python $GITHUB_WORKSPACE/.github/utils/save_version.py $GITHUB_WORKSPACE + + - name: Publish AAB to Google Play + uses: r0adkll/upload-google-play@v1 + if: ${{ endsWith(needs.sign.outputs.signedReleaseFile, '.aab') }} + with: + serviceAccountJsonPlainText: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }} + packageName: pl.szczodrzynski.edziennik + releaseFile: ${{ needs.sign.outputs.signedReleaseFile }} + releaseName: ${{ steps.changelog.outputs.appVersionName }} + track: ${{ secrets.PLAY_RELEASE_TRACK }} + whatsNewDirectory: ${{ steps.changelog.outputs.changelogDir }} + + - name: Upload workflow artifact + uses: actions/upload-artifact@v2 + if: always() + with: + name: ${{ steps.changelog.outputs.appVersionName }} + path: | + app/release/whatsnew*/ + app/release/*.apk + app/release/*.aab + app/release/*.json + app/release/*.txt diff --git a/.github/workflows/build-release-apk.yml b/.github/workflows/build-release-apk.yml new file mode 100644 index 00000000..4816ee73 --- /dev/null +++ b/.github/workflows/build-release-apk.yml @@ -0,0 +1,153 @@ +name: Release build - official + +on: + push: + tags: + - "*" + +jobs: + prepare: + name: Prepare build environment + runs-on: self-hosted + steps: + - name: Checkout repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 + clean: false + - name: Set executable permissions to gradlew + run: chmod +x ./gradlew + - name: Setup Python + uses: actions/setup-python@v2 + - name: Install packages + uses: BSFishy/pip-action@v1 + with: + packages: | + python-dotenv + pycryptodome + mysql-connector-python + requests + - name: Write signing passwords + env: + DB_HOST: ${{ secrets.DB_HOST }} + DB_USER: ${{ secrets.DB_USER }} + DB_PASS: ${{ secrets.DB_PASS }} + DB_NAME: ${{ secrets.DB_NAME }} + run: python $GITHUB_WORKSPACE/.github/utils/sign.py $GITHUB_WORKSPACE commit + build: + name: Build APK + runs-on: self-hosted + needs: + - prepare + outputs: + androidHome: ${{ env.ANDROID_HOME }} + androidSdkRoot: ${{ env.ANDROID_SDK_ROOT }} + steps: + - name: Setup JDK 11 + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: '11' + cache: 'gradle' + - name: Setup Android SDK + uses: android-actions/setup-android@v2 + - name: Clean build artifacts + run: | + rm -rf app/release/* + rm -rf app/build/outputs/apk/* + rm -rf app/build/outputs/bundle/* + - name: Assemble official release with Gradle + run: ./gradlew assembleOfficialRelease + sign: + name: Sign APK + runs-on: self-hosted + needs: + - build + outputs: + signedReleaseFile: ${{ steps.artifacts.outputs.signedReleaseFile }} + signedReleaseFileRelative: ${{ steps.artifacts.outputs.signedReleaseFileRelative }} + steps: + - name: Sign build artifacts + id: sign_app + uses: r0adkll/sign-android-release@v1 + with: + releaseDirectory: app/release + signingKeyBase64: ${{ secrets.KEY_STORE }} + alias: ${{ secrets.KEY_ALIAS }} + keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.KEY_ALIAS_PASSWORD }} + env: + ANDROID_HOME: ${{ needs.build.outputs.androidHome }} + ANDROID_SDK_ROOT: ${{ needs.build.outputs.androidSdkRoot }} + BUILD_TOOLS_VERSION: "30.0.2" + - name: Rename signed artifacts + id: artifacts + run: python $GITHUB_WORKSPACE/.github/utils/rename_artifacts.py $GITHUB_WORKSPACE + publish: + name: Publish APK + runs-on: self-hosted + needs: + - sign + steps: + - name: Setup Python + uses: actions/setup-python@v2 + + - name: Extract changelogs + id: changelog + run: python $GITHUB_WORKSPACE/.github/utils/extract_changelogs.py $GITHUB_WORKSPACE + + - name: Upload APK to SFTP + uses: easingthemes/ssh-deploy@v2.1.6 + env: + REMOTE_HOST: ${{ secrets.SSH_IP }} + REMOTE_USER: ${{ secrets.SSH_USERNAME }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_KEY }} + SOURCE: ${{ needs.sign.outputs.signedReleaseFileRelative }} + TARGET: ${{ secrets.SSH_PATH_RELEASE }} + - name: Save version metadata + env: + DB_HOST: ${{ secrets.DB_HOST }} + DB_USER: ${{ secrets.DB_USER }} + DB_PASS: ${{ secrets.DB_PASS }} + DB_NAME: ${{ secrets.DB_NAME }} + APK_SERVER_RELEASE: ${{ secrets.APK_SERVER_RELEASE }} + APK_SERVER_NIGHTLY: ${{ secrets.APK_SERVER_NIGHTLY }} + run: python $GITHUB_WORKSPACE/.github/utils/save_version.py $GITHUB_WORKSPACE + + - name: Distribute to App Distribution + uses: wzieba/Firebase-Distribution-Github-Action@v1 + with: + appId: ${{ secrets.FIREBASE_APP_ID }} + token: ${{ secrets.FIREBASE_TOKEN }} + groups: ${{ secrets.FIREBASE_GROUPS_RELEASE }} + file: ${{ needs.sign.outputs.signedReleaseFile }} + releaseNotesFile: ${{ steps.changelog.outputs.changelogPlainTitledFile }} + - name: Release on GitHub + uses: softprops/action-gh-release@v1 + with: + name: ${{ steps.changelog.outputs.changelogTitle }} + body_path: ${{ steps.changelog.outputs.changelogMarkdownFile }} + files: ${{ needs.sign.outputs.signedReleaseFile }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Post Discord webhook + env: + APK_FILE: ${{ needs.sign.outputs.signedReleaseFile }} + APK_SERVER_RELEASE: ${{ secrets.APK_SERVER_RELEASE }} + APK_SERVER_NIGHTLY: ${{ secrets.APK_SERVER_NIGHTLY }} + WEBHOOK_RELEASE: ${{ secrets.WEBHOOK_RELEASE }} + WEBHOOK_TESTING: ${{ secrets.WEBHOOK_TESTING }} + run: python $GITHUB_WORKSPACE/.github/utils/webhook_discord.py $GITHUB_WORKSPACE + + - name: Upload workflow artifact + uses: actions/upload-artifact@v2 + if: true + with: + name: ${{ steps.changelog.outputs.appVersionName }} + path: | + app/release/whatsnew*/ + app/release/*.apk + app/release/*.aab + app/release/*.json + app/release/*.txt diff --git a/.gitignore b/.gitignore index 25786692..375b15e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,11 @@ + +# Created by https://www.toptal.com/developers/gitignore/api/android,androidstudio,gradle,java,kotlin +# Edit at https://www.toptal.com/developers/gitignore?templates=android,androidstudio,gradle,java,kotlin + +### Android ### # Built application files *.apk +*.aar *.ap_ *.aab @@ -23,7 +29,7 @@ build/ local.properties # Proguard folder generated by Eclipse -#proguard/ +# proguard/ # Log Files *.log @@ -40,22 +46,22 @@ captures/ .idea/tasks.xml .idea/gradle.xml .idea/assetWizardSettings.xml -.idea/dictionaries +#.idea/dictionaries .idea/libraries # Android Studio 3 in .gitignore file. .idea/caches .idea/modules.xml # Comment next line if keeping position of elements in Navigation Editor is relevant for you .idea/navEditor.xml -.idea/copyright/profiles_settings.xml # Keystore files # Uncomment the following lines if you do not want to check your keystore files in. -*.jks -*.keystore +#*.jks +#*.keystore # External native build folder generated in Android Studio 2.2 and later .externalNativeBuild +.cxx/ # Google Services (e.g. APIs or Firebase) # google-services.json @@ -82,8 +88,181 @@ lint/outputs/ lint/tmp/ # lint/reports/ -app/schemas/ +### Android Patch ### +gen-external-apklibs +output-metadata.json + +# Replacement of .externalNativeBuild directories introduced +# with Android Studio 3.5. + +### Java ### +# Compiled class file + +# Log file + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +!/*/libs/*.jar + +### Kotlin ### +# Compiled class file + +# Log file + +# BlueJ files + +# Mobile Tools for Java (J2ME) + +# Package Files # + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml + +### Gradle ### +.gradle + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Gradle Patch ### +**/build/ + +### AndroidStudio ### +# Covers files to be ignored for android development using Android Studio. + +# Built application files + +# Files for the ART/Dalvik VM + +# Java class files + +# Generated files + +# Gradle files + +# Signing files +.signing/ + +# Local configuration file (sdk path, etc) + +# Proguard folder generated by Eclipse + +# Log Files + +# Android Studio +/*/build/ +/*/local.properties +/*/out +/*/*/build +/*/*/production +*.ipr +*~ +*.swp + +# Keystore files +*.jks +*.keystore + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Android Patch + +# External native build folder generated in Android Studio 2.2 and later + +# NDK +obj/ + +# IntelliJ IDEA +*.iws +/out/ + +# User-specific configurations +.idea/caches/ +.idea/libraries/ +.idea/shelf/ +.idea/.name +.idea/compiler.xml +.idea/copyright/profiles_settings.xml +.idea/encodings.xml +.idea/misc.xml +.idea/scopes/scope_settings.xml +.idea/vcs.xml +.idea/jsLibraryMappings.xml +.idea/datasources.xml +.idea/dataSources.ids +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml +.idea/jarRepositories.xml + +# OS-specific files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Legacy Eclipse project files +.classpath +.project +.cproject +.settings/ + +# Mobile Tools for Java (J2ME) + +# Package Files # + +# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml) + +## Plugin-specific files: + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Mongo Explorer plugin +.idea/mongoSettings.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +### AndroidStudio Patch ### + +!/gradle/wrapper/gradle-wrapper.jar + +# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,gradle,java,kotlin signatures/ - -app/.cxx \ No newline at end of file +.idea/*.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 681f41ae..7643783a 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,10 @@ + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/dictionaries/Kuba.xml b/.idea/dictionaries/Kuba.xml new file mode 100644 index 00000000..592a5d5e --- /dev/null +++ b/.idea/dictionaries/Kuba.xml @@ -0,0 +1,18 @@ + + + + autoryzacji + ciasteczko + csrf + edziennik + elearning + gson + hebe + idziennik + kuba + synergia + szczodrzyński + szkolny + + + \ No newline at end of file diff --git a/.idea/discord.xml b/.idea/discord.xml deleted file mode 100644 index 59b11d1d..00000000 --- a/.idea/discord.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 15a15b21..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml deleted file mode 100644 index 0dd4b354..00000000 --- a/.idea/kotlinc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 15ef006b..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460d..00000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..810fce6e --- /dev/null +++ b/LICENSE @@ -0,0 +1,621 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) 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; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS diff --git a/README.md b/README.md index 3cf34f9b..1646ab6b 100644 --- a/README.md +++ b/README.md @@ -1 +1,85 @@ -Szkolny.eu +
    + +![Readme Banner](.github/readme-banner.png) + +[![Discord](https://img.shields.io/discord/619178050562686988?color=%237289DA&logo=discord&logoColor=white&style=for-the-badge)](https://szkolny.eu/discord) +[![Oficjalna strona](https://img.shields.io/badge/-website-orange?style=for-the-badge&logo=internet-explorer&logoColor=white)](https://szkolny.eu/) +[![Facebook Fanpage](https://img.shields.io/badge/-facebook-blue?style=for-the-badge&logo=facebook&logoColor=white)](https://szkolny.eu/facebook) + +![Wersja Androida](https://img.shields.io/badge/android-4.1%2B-orange?style=for-the-badge&logo=android) +[![Najnowsza wersja](https://img.shields.io/github/v/release/szkolny-eu/szkolny-android?color=%2344CC11&include_prereleases&logo=github&logoColor=white&style=for-the-badge)](https://github.com/szkolny-eu/szkolny-android/releases/latest) +![Licencja](https://img.shields.io/github/license/szkolny-eu/szkolny-android?color=blue&logo=github&logoColor=white&style=for-the-badge) + +[![Release build](https://img.shields.io/github/workflow/status/szkolny-eu/szkolny-android/Release%20build%20-%20official?label=Release&logo=github-actions&logoColor=white&style=for-the-badge)](https://github.com/szkolny-eu/szkolny-android/actions/workflows/build-release-apk.yml) +[![Play build](https://img.shields.io/github/workflow/status/szkolny-eu/szkolny-android/Release%20build%20-%20Google%20Play%20%5BAAB%5D?label=Play&logo=google-play&logoColor=white&style=for-the-badge)](https://github.com/szkolny-eu/szkolny-android/actions/workflows/build-release-aab-play.yml) +[![Nightly build](https://img.shields.io/github/workflow/status/szkolny-eu/szkolny-android/Nightly%20build?label=Nightly&logo=github-actions&logoColor=white&style=for-the-badge)](https://github.com/szkolny-eu/szkolny-android/actions/workflows/build-nightly-apk.yml) + +
    + +## Ważna informacja + +Jak zapewne już wiecie, we wrześniu 2020 r. **firma Librus zabroniła nam** publikowania w sklepie Google Play naszej aplikacji z obsługą dziennika Librus® Synergia. Prowadziliśmy rozmowy, aby **umożliwić Wam wygodny, bezpłatny dostęp do Waszych ocen, wiadomości, zadań domowych**, jednak oczekiwania firmy Librus zdecydowanie przekroczyły wszelkie nasze możliwości finansowe. Mając na uwadze powyższe względy, zdecydowaliśmy się opublikować kod źródłowy aplikacji Szkolny.eu. Liczymy, że dzięki temu aplikacja będzie mogła dalej funkcjonować, być rozwijana, pomagając Wam w czasie zdalnego nauczania i przez kolejne lata nauki. + +__Zachęcamy do [przeczytania całej informacji](https://szkolny.eu/informacja) na naszej stronie.__ + +*- Autorzy Szkolny.eu* + +## O aplikacji + +Szkolny.eu jest nieoficjalną aplikacją, umożliwiającą rodzicom i uczniom dostęp do danych z e-dziennika w każdym smartfonie. Jest to jedyna aplikacja, która posiada wsparcie dla wszystkich najpopularniejszych e-dzienników. Oznacza to, że mając kilka kont w różnych szkołach, wystarczy mieć tylko jedną aplikację. + +### Funkcje aplikacji + +- plan lekcji, terminarz, oceny, wiadomości, zadania domowe, uwagi, frekwencja +- wygodne **widgety** na ekran główny +- łatwa komunikacja z nauczycielami — **odbieranie, wyszukiwanie i wysyłanie wiadomości** +- pobieranie **załączników wiadomości i zadań domowych** +- **powiadomienia** o nowych informacjach na telefonie lub na komputerze +- organizacja zadań domowych i sprawdzianów — łatwe oznaczanie jako wykonane +- obliczanie **średniej ocen** ze wszystkich przedmiotów, oceny proponowane i końcowe +- Symulator edycji ocen — obliczanie średniej z przedmiotu po zmianie dowolnych jego ocen +- **dodawanie własnych wydarzeń** i zadań do terminarza +- nowoczesny i intuicyjny interfejs użytkownika +- **obsługa wielu profili** uczniów — jeżeli jesteś Rodzicem, możesz skonfigurować wszystkie swoje konta uczniowskie i łatwo między nimi przełączać +- opcja **automatycznej synchronizacji** z E-dziennikiem +- opcja Ciszy nocnej — nigdy więcej budzących Cię dźwięków z telefonu + +[Zobacz porównanie funkcji z innymi aplikacjami](https://szkolny.eu/funkcje) + +### Pobieranie + +Najnowsze wersje możesz pobrać z Google Play lub bezpośrednio z naszej strony, w formacie .APK. + +[](https://szkolny.eu/pobierz/android) +[](https://szkolny.eu/pobierz) + +### Kompilacja + +Aby uruchomić aplikację „ze źródeł” należy użyć Android Studio w wersji co najmniej 4.2 Beta 6. Wersja `debug` może wtedy zostać zainstalowana np. na emulatorze Androida. + +Aby zbudować wersję produkcyjną, tzn. `release` należy użyć wariantu `mainRelease` oraz podpisać wyjściowy plik .APK sygnaturą w wersji V1 i V2. + +Warianty `play` oraz `official` są zastrzeżone dla wydań oficjalnych. + +## Współpraca + +PRy wprowadzające nowe funkcje lub naprawiające błędy są mile widziane! + +__Jeśli masz jakieś pytania, zapraszamy na [nasz serwer Discord](https://szkolny.eu/discord).__ + +## Licencja + +Szkolny.eu publikowany jest na licencji [GNU GPLv3](LICENSE). W szczególności, deweloper: +- Może modyfikować oraz usprawniać kod aplikacji +- Może dystrybuować wersje produkcyjne +- Musi opublikować wszelkie wprowadzone zmiany, tzn. publiczny fork tego repozytorium +- Nie może zmieniać licencji ani copyrightu aplikacji + +Dodatkowo: +- Zabronione jest modyfikowanie lub usuwanie kodu odpowiedzialnego za zgodność wersji produkcyjnych z licencją. + +- **Wersje skompilowane nie mogą być dystrybuowane za pomocą Google Play oraz żadnej platformy, na której istnieje oficjalna wersja aplikacji**. + +**Autorzy aplikacji nie biorą odpowiedzialności za używanie aplikacji, modyfikowanie oraz dystrybuowanie.** + +Znaki towarowe zamieszczone w aplikacji oraz tym dokumencie należą do ich prawowitych właścicieli i są używane wyłącznie w celach informacyjnych. diff --git a/agendacalendarview/.gitignore b/agendacalendarview/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/agendacalendarview/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/agendacalendarview/build.gradle b/agendacalendarview/build.gradle deleted file mode 100644 index 824ce517..00000000 --- a/agendacalendarview/build.gradle +++ /dev/null @@ -1,54 +0,0 @@ -apply plugin: 'com.android.library' -//apply plugin: 'me.tatarka.retrolambda' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - android { - lintOptions { - abortOnError false - } - } - - defaultConfig { - minSdkVersion 14 - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - debugMinify { - debuggable = true - minifyEnabled = true - proguardFiles 'proguard-android.txt' - } - } - sourceSets { - main { - assets.srcDirs = ['assets'] - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} - -//apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - // Google libraries - implementation "androidx.appcompat:appcompat:${androidXAppCompat}" - implementation "androidx.recyclerview:recyclerview:${androidXRecyclerView}" - implementation "com.google.android.material:material:${googleMaterial}" - - // other libraries - //implementation 'se.emilsjolander:stickylistheaders:2.7.0' - implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT@aar' - implementation 'io.reactivex:rxjava:1.1.1' -} diff --git a/agendacalendarview/src/main/AndroidManifest.xml b/agendacalendarview/src/main/AndroidManifest.xml deleted file mode 100644 index 38e54711..00000000 --- a/agendacalendarview/src/main/AndroidManifest.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/AgendaCalendarView.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/AgendaCalendarView.java deleted file mode 100644 index 0d0c0cf4..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/AgendaCalendarView.java +++ /dev/null @@ -1,264 +0,0 @@ -package com.github.tibolte.agendacalendarview; - -import android.animation.Animator; -import android.animation.ObjectAnimator; -import android.content.Context; -import android.content.res.ColorStateList; -import android.content.res.TypedArray; -import android.os.Handler; -import androidx.annotation.NonNull; -import android.util.AttributeSet; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.AbsListView; -import android.widget.AdapterView; -import android.widget.FrameLayout; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.github.tibolte.agendacalendarview.agenda.AgendaAdapter; -import com.github.tibolte.agendacalendarview.agenda.AgendaView; -import com.github.tibolte.agendacalendarview.calendar.CalendarView; -import com.github.tibolte.agendacalendarview.models.BaseCalendarEvent; -import com.github.tibolte.agendacalendarview.models.CalendarEvent; -import com.github.tibolte.agendacalendarview.models.DayItem; -import com.github.tibolte.agendacalendarview.models.IDayItem; -import com.github.tibolte.agendacalendarview.models.IWeekItem; -import com.github.tibolte.agendacalendarview.models.WeekItem; -import com.github.tibolte.agendacalendarview.render.DefaultEventRenderer; -import com.github.tibolte.agendacalendarview.render.EventRenderer; -import com.github.tibolte.agendacalendarview.utils.BusProvider; -import com.github.tibolte.agendacalendarview.utils.Events; -import com.github.tibolte.agendacalendarview.utils.ListViewScrollTracker; -import com.github.tibolte.agendacalendarview.widgets.FloatingActionButton; - -import java.util.Calendar; -import java.util.List; -import java.util.Locale; - -import se.emilsjolander.stickylistheaders.StickyListHeadersListView; - -/** - * View holding the agenda and calendar view together. - */ -public class AgendaCalendarView extends FrameLayout implements StickyListHeadersListView.OnStickyHeaderChangedListener { - - private static final String LOG_TAG = AgendaCalendarView.class.getSimpleName(); - - private CalendarView mCalendarView; - private AgendaView mAgendaView; - private FloatingActionButton mFloatingActionButton; - - private int mAgendaCurrentDayTextColor, mCalendarHeaderColor, mCalendarHeaderTextColor, mCalendarBackgroundColor, mCalendarDayTextColor, mCalendarPastDayTextColor, mCalendarCurrentDayColor, mFabColor; - private CalendarPickerController mCalendarPickerController; - - public AgendaView getAgendaView() { - return mAgendaView; - } - - private ListViewScrollTracker mAgendaListViewScrollTracker; - private AbsListView.OnScrollListener mAgendaScrollListener = new AbsListView.OnScrollListener() { - int mCurrentAngle; - int mMaxAngle = 85; - - @Override - public void onScrollStateChanged(AbsListView view, int scrollState) { - - } - - @Override - public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { - int scrollY = mAgendaListViewScrollTracker.calculateScrollY(firstVisibleItem, visibleItemCount); - if (scrollY != 0) { - mFloatingActionButton.show(); - } - //Log.d(LOG_TAG, String.format("Agenda listView scrollY: %d", scrollY)); - /*int toAngle = scrollY / 100; - if (toAngle > mMaxAngle) { - toAngle = mMaxAngle; - } else if (toAngle < -mMaxAngle) { - toAngle = -mMaxAngle; - } - RotateAnimation rotate = new RotateAnimation(mCurrentAngle, toAngle, mFloatingActionButton.getWidth() / 2, mFloatingActionButton.getHeight() / 2); - rotate.setFillAfter(true); - mCurrentAngle = toAngle; - mFloatingActionButton.startAnimation(rotate);*/ - } - }; - - // region Constructors - - public AgendaCalendarView(Context context) { - super(context); - } - - public AgendaCalendarView(Context context, AttributeSet attrs) { - super(context, attrs); - - TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ColorOptionsView, 0, 0); - mAgendaCurrentDayTextColor = a.getColor(R.styleable.ColorOptionsView_agendaCurrentDayTextColor, getResources().getColor(R.color.theme_primary)); - mCalendarHeaderColor = a.getColor(R.styleable.ColorOptionsView_calendarHeaderColor, getResources().getColor(R.color.theme_primary_dark)); - mCalendarHeaderTextColor = a.getColor(R.styleable.ColorOptionsView_calendarHeaderTextColor, getResources().getColor(R.color.theme_text_icons)); - mCalendarBackgroundColor = a.getColor(R.styleable.ColorOptionsView_calendarColor, getResources().getColor(R.color.theme_primary)); - mCalendarDayTextColor = a.getColor(R.styleable.ColorOptionsView_calendarDayTextColor, getResources().getColor(R.color.theme_text_icons)); - mCalendarCurrentDayColor = a.getColor(R.styleable.ColorOptionsView_calendarCurrentDayTextColor, getResources().getColor(R.color.calendar_text_current_day)); - mCalendarPastDayTextColor = a.getColor(R.styleable.ColorOptionsView_calendarPastDayTextColor, getResources().getColor(R.color.theme_light_primary)); - mFabColor = a.getColor(R.styleable.ColorOptionsView_fabColor, getResources().getColor(R.color.theme_accent)); - - LayoutInflater inflater = (LayoutInflater) context - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - inflater.inflate(R.layout.view_agendacalendar, this, true); - - setAlpha(0f); - } - - // endregion - - // region Class - View - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - mCalendarView = (CalendarView) findViewById(R.id.calendar_view); - mAgendaView = (AgendaView) findViewById(R.id.agenda_view); - mFloatingActionButton = (FloatingActionButton) findViewById(R.id.floating_action_button); - ColorStateList csl = new ColorStateList(new int[][]{new int[0]}, new int[]{mFabColor}); - mFloatingActionButton.setBackgroundTintList(csl); - - LinearLayout mDayNamesHeader = mCalendarView.findViewById(R.id.cal_day_names); - mDayNamesHeader.setBackgroundColor(mCalendarHeaderColor); - for (int i = 0; i < mDayNamesHeader.getChildCount(); i++) { - TextView txtDay = (TextView) mDayNamesHeader.getChildAt(i); - txtDay.setTextColor(mCalendarHeaderTextColor); - } - mCalendarView.findViewById(R.id.list_week).setBackgroundColor(mCalendarBackgroundColor); - - mAgendaView.getAgendaListView().setOnItemClickListener((AdapterView parent, View view, int position, long id) -> { - mCalendarPickerController.onEventSelected(CalendarManager.getInstance().getEvents().get(position)); - }); - - BusProvider.getInstance().toObserverable() - .subscribe(event -> { - if (event instanceof Events.DayClickedEvent) { - if (mCalendarPickerController != null) - mCalendarPickerController.onDaySelected(((Events.DayClickedEvent) event).getDay()); - } else if (event instanceof Events.EventsFetched) { - ObjectAnimator alphaAnimation = ObjectAnimator.ofFloat(this, "alpha", getAlpha(), 1f).setDuration(500); - alphaAnimation.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - - } - - @Override - public void onAnimationEnd(Animator animation) { - long fabAnimationDelay = 500; - // Just after setting the alpha from this view to 1, we hide the fab. - // It will reappear as soon as the user is scrolling the Agenda view. - new Handler().postDelayed(() -> { - mFloatingActionButton.hide(); - mAgendaListViewScrollTracker = new ListViewScrollTracker(mAgendaView.getAgendaListView()); - mAgendaView.getAgendaListView().setOnScrollListener(mAgendaScrollListener); - mFloatingActionButton.setOnClickListener((v) -> { - mAgendaView.translateList(0); - mAgendaView.getAgendaListView().smoothScrollBy(0, 0); - //mAgendaView.getAgendaListView().getWrappedList().smoothScrollBy(0, 0); - mAgendaView.getAgendaListView().scrollToCurrentDate(CalendarManager.getInstance().getToday()); - new Handler().postDelayed(() -> mFloatingActionButton.hide(), fabAnimationDelay); - }); - }, fabAnimationDelay); - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }); - alphaAnimation.start(); - } - }); - } - - // endregion - - // region Interface - StickyListHeadersListView.OnStickyHeaderChangedListener - - @Override - public void onStickyHeaderChanged(StickyListHeadersListView stickyListHeadersListView, View header, int position, long headerId) { - //Log.d(LOG_TAG, String.format("onStickyHeaderChanged, position = %d, headerId = %d", position, headerId)); - - if (CalendarManager.getInstance().getEvents().size() > 0) { - CalendarEvent event = CalendarManager.getInstance().getEvents().get(position); - if (event != null) { - mCalendarView.scrollToDate(event); - mCalendarPickerController.onScrollToDate(event.getInstanceDay()); - } - } - } - - // endregion - - // region Public methods - - public void init(List eventList, Calendar minDate, Calendar maxDate, Locale locale, CalendarPickerController calendarPickerController, EventRenderer ... renderers) { - mCalendarPickerController = calendarPickerController; - - CalendarManager.getInstance(getContext()).buildCal(minDate, maxDate, locale, new DayItem(), new WeekItem()); - - // Feed our views with weeks list and events - mCalendarView.init(CalendarManager.getInstance(getContext()), mCalendarDayTextColor, mCalendarCurrentDayColor, mCalendarPastDayTextColor, eventList); - - // Load agenda events and scroll to current day - AgendaAdapter agendaAdapter = new AgendaAdapter(mAgendaCurrentDayTextColor); - mAgendaView.getAgendaListView().setAdapter(agendaAdapter); - mAgendaView.getAgendaListView().setOnStickyHeaderChangedListener(this); - - CalendarManager.getInstance().loadEvents(eventList, new BaseCalendarEvent()); - BusProvider.getInstance().send(new Events.EventsFetched()); - Log.d(LOG_TAG, "CalendarEventTask finished, event count "+eventList.size()); - - // add default event renderer - addEventRenderer(new DefaultEventRenderer()); - for (EventRenderer renderer: renderers) { - addEventRenderer(renderer); - } - } - - public void init(Locale locale, List lWeeks, List lDays, List lEvents, CalendarPickerController calendarPickerController) { - mCalendarPickerController = calendarPickerController; - - CalendarManager.getInstance(getContext()).loadCal(locale, lWeeks, lDays, lEvents); - - // Feed our views with weeks list and events - mCalendarView.init(CalendarManager.getInstance(getContext()), mCalendarDayTextColor, mCalendarCurrentDayColor, mCalendarPastDayTextColor, lEvents); - - // Load agenda events and scroll to current day - AgendaAdapter agendaAdapter = new AgendaAdapter(mAgendaCurrentDayTextColor); - mAgendaView.getAgendaListView().setAdapter(agendaAdapter); - mAgendaView.getAgendaListView().setOnStickyHeaderChangedListener(this); - - // notify that actually everything is loaded - BusProvider.getInstance().send(new Events.EventsFetched()); - Log.d(LOG_TAG, "CalendarEventTask finished"); - - // add default event renderer - addEventRenderer(new DefaultEventRenderer()); - } - - public void addEventRenderer(@NonNull final EventRenderer renderer) { - AgendaAdapter adapter = (AgendaAdapter) mAgendaView.getAgendaListView().getAdapter(); - adapter.addEventRenderer(renderer); - } - - public void enableFloatingIndicator(boolean enable) { - mFloatingActionButton.setVisibility(enable ? VISIBLE : GONE); - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/CalendarManager.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/CalendarManager.java deleted file mode 100644 index c661d32b..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/CalendarManager.java +++ /dev/null @@ -1,267 +0,0 @@ -package com.github.tibolte.agendacalendarview; - -import com.github.tibolte.agendacalendarview.models.CalendarEvent; -import com.github.tibolte.agendacalendarview.models.IDayItem; -import com.github.tibolte.agendacalendarview.models.IWeekItem; -import com.github.tibolte.agendacalendarview.utils.DateHelper; - -import android.content.Context; -import android.util.Log; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Locale; - -/** - * This class manages information about the calendar. (Events, weather info...) - * Holds reference to the days list of the calendar. - * As the app is using several views, we want to keep everything in one place. - */ -public class CalendarManager { - - private static final String LOG_TAG = CalendarManager.class.getSimpleName(); - - private static CalendarManager mInstance; - - private Context mContext; - private Locale mLocale; - private Calendar mToday = Calendar.getInstance(); - private SimpleDateFormat mWeekdayFormatter; - private SimpleDateFormat mMonthHalfNameFormat; - - /// instances of classes provided from outside - private IDayItem mCleanDay; - private IWeekItem mCleanWeek; - - /** - * List of days used by the calendar - */ - private List mDays = new ArrayList<>(); - /** - * List of weeks used by the calendar - */ - private List mWeeks = new ArrayList<>(); - /** - * List of events instances - */ - private List mEvents = new ArrayList<>(); - - // region Constructors - - public CalendarManager(Context context) { - this.mContext = context; - } - - public static CalendarManager getInstance(Context context) { - if (mInstance == null) { - mInstance = new CalendarManager(context); - } - return mInstance; - } - - public static CalendarManager getInstance() { - return mInstance; - } - - // endregion - - // region Getters/Setters - - public Locale getLocale() { - return mLocale; - } - - public Context getContext() { - return mContext; - } - - public Calendar getToday() { - return mToday; - } - - public void setToday(Calendar today) { - this.mToday = today; - } - - public List getWeeks() { - return mWeeks; - } - - public List getEvents() { - return mEvents; - } - - public List getDays() { - return mDays; - } - - public SimpleDateFormat getWeekdayFormatter() { - return mWeekdayFormatter; - } - - public SimpleDateFormat getMonthHalfNameFormat() { - return mMonthHalfNameFormat; - } - - // endregion - - // region Public methods - - public void buildCal(Calendar minDate, Calendar maxDate, Locale locale, IDayItem cleanDay, IWeekItem cleanWeek) { - if (minDate == null || maxDate == null) { - throw new IllegalArgumentException( - "minDate and maxDate must be non-null."); - } - if (minDate.after(maxDate)) { - throw new IllegalArgumentException( - "minDate must be before maxDate."); - } - if (locale == null) { - throw new IllegalArgumentException("Locale is null."); - } - - setLocale(locale); - - mDays.clear(); - mWeeks.clear(); - mEvents.clear(); - - mCleanDay = cleanDay; - mCleanWeek = cleanWeek; - - Calendar mMinCal = Calendar.getInstance(mLocale); - Calendar mMaxCal = Calendar.getInstance(mLocale); - Calendar mWeekCounter = Calendar.getInstance(mLocale); - - mMinCal.setTime(minDate.getTime()); - mMaxCal.setTime(maxDate.getTime()); - - // maxDate is exclusive, here we bump back to the previous day, as maxDate if December 1st, 2020, - // we don't include that month in our list - mMaxCal.add(Calendar.MINUTE, -1); - - // Now iterate we iterate between mMinCal and mMaxCal so we build our list of weeks - mWeekCounter.setTime(mMinCal.getTime()); - int maxMonth = mMaxCal.get(Calendar.MONTH); - int maxYear = mMaxCal.get(Calendar.YEAR); - - int currentMonth = mWeekCounter.get(Calendar.MONTH); - int currentYear = mWeekCounter.get(Calendar.YEAR); - - // Loop through the weeks - while ((currentMonth <= maxMonth // Up to, including the month. - || currentYear < maxYear) // Up to the year. - && currentYear < maxYear + 1) { // But not > next yr. - - Date date = mWeekCounter.getTime(); - // Build our week list - int currentWeekOfYear = mWeekCounter.get(Calendar.WEEK_OF_YEAR); - - IWeekItem weekItem = cleanWeek.copy(); - weekItem.setWeekInYear(currentWeekOfYear); - weekItem.setYear(currentYear); - weekItem.setDate(date); - weekItem.setMonth(currentMonth); - weekItem.setLabel(mMonthHalfNameFormat.format(date)); - List dayItems = getDayCells(mWeekCounter); // gather days for the built week - weekItem.setDayItems(dayItems); - mWeeks.add(weekItem); - - //Log.d(LOG_TAG, String.format("Adding week: %s", weekItem)); - - mWeekCounter.add(Calendar.WEEK_OF_YEAR, 1); - - currentMonth = mWeekCounter.get(Calendar.MONTH); - currentYear = mWeekCounter.get(Calendar.YEAR); - } - } - - public void loadEvents(List eventList, CalendarEvent noEvent) { - - for (IWeekItem weekItem : getWeeks()) { - for (IDayItem dayItem : weekItem.getDayItems()) { - boolean isEventForDay = false; - boolean isShowBadgeForDay = false; - for (CalendarEvent event : eventList) { - if (DateHelper.isBetweenInclusive(dayItem.getDate(), event.getStartTime(), event.getEndTime())) { - CalendarEvent copy = event.copy(); - - if (copy.getShowBadge()) { - isShowBadgeForDay = true; - } - - Calendar dayInstance = Calendar.getInstance(); - dayInstance.setTime(dayItem.getDate()); - copy.setInstanceDay(dayInstance); - copy.setDayReference(dayItem); - copy.setWeekReference(weekItem); - // add instances in chronological order - getEvents().add(copy); - isEventForDay = true; - } - } - if (!isEventForDay) { - Calendar dayInstance = Calendar.getInstance(); - dayInstance.setTime(dayItem.getDate()); - CalendarEvent copy = noEvent.copy(); - - copy.setInstanceDay(dayInstance); - copy.setDayReference(dayItem); - copy.setWeekReference(weekItem); - copy.setLocation(""); - copy.setTitle(getContext().getResources().getString(R.string.agenda_event_no_events)); - copy.setPlaceholder(true); - getEvents().add(copy); - } - dayItem.setShowBadge(isShowBadgeForDay); - } - } - } - - public void loadCal (Locale locale, List lWeeks, List lDays, List lEvents) { - mWeeks = lWeeks; - mDays = lDays; - mEvents = lEvents; - setLocale(locale); - } - - // endregion - - // region Private methods - - private List getDayCells(Calendar startCal) { - Calendar cal = Calendar.getInstance(mLocale); - cal.setTime(startCal.getTime()); - List dayItems = new ArrayList<>(); - - int firstDayOfWeek = cal.get(Calendar.DAY_OF_WEEK); - int offset = cal.getFirstDayOfWeek() - firstDayOfWeek; - if (offset > 0) { - offset -= 7; - } - cal.add(Calendar.DATE, offset); - - //Log.d(LOG_TAG, String.format("Buiding row week starting at %s", cal.getTime())); - for (int c = 0; c < 7; c++) { - IDayItem dayItem = mCleanDay.copy(); - dayItem.buildDayItemFromCal(cal); - dayItems.add(dayItem); - cal.add(Calendar.DATE, 1); - } - - mDays.addAll(dayItems); - return dayItems; - } - - private void setLocale(Locale locale) { - this.mLocale = locale; - setToday(Calendar.getInstance(mLocale)); - mWeekdayFormatter = new SimpleDateFormat(getContext().getString(R.string.day_name_format), mLocale); - mMonthHalfNameFormat = new SimpleDateFormat(getContext().getString(R.string.month_half_name_format), locale); - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/CalendarPickerController.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/CalendarPickerController.java deleted file mode 100644 index a2a86dde..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/CalendarPickerController.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.tibolte.agendacalendarview; - -import com.github.tibolte.agendacalendarview.models.CalendarEvent; -import com.github.tibolte.agendacalendarview.models.IDayItem; - -import java.util.Calendar; - -public interface CalendarPickerController { - void onDaySelected(IDayItem dayItem); - - void onEventSelected(CalendarEvent event); - - void onScrollToDate(Calendar calendar); -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaAdapter.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaAdapter.java deleted file mode 100644 index 2e6c6d31..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaAdapter.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.github.tibolte.agendacalendarview.agenda; - -import com.github.tibolte.agendacalendarview.models.CalendarEvent; -import com.github.tibolte.agendacalendarview.render.DefaultEventRenderer; -import com.github.tibolte.agendacalendarview.render.EventRenderer; - -import androidx.annotation.NonNull; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; - -import java.util.ArrayList; -import java.util.List; - -import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter; - -/** - * Adapter for the agenda, implements StickyListHeadersAdapter. - * Days as sections and CalendarEvents as list items. - */ -public class AgendaAdapter extends BaseAdapter implements StickyListHeadersAdapter { - - private List mEvents = new ArrayList<>(); - private List> mRenderers = new ArrayList<>(); - private int mCurrentDayColor; - - // region Constructor - - public AgendaAdapter(int currentDayTextColor) { - this.mCurrentDayColor = currentDayTextColor; - } - - // endregion - - // region Public methods - - public void updateEvents(List events) { - this.mEvents.clear(); - this.mEvents.addAll(events); - notifyDataSetChanged(); - } - - // endregion - - // region Interface - StickyListHeadersAdapter - - @Override - public View getHeaderView(int position, View convertView, ViewGroup parent) { - AgendaHeaderView agendaHeaderView = (AgendaHeaderView) convertView; - if (agendaHeaderView == null) { - agendaHeaderView = AgendaHeaderView.inflate(parent); - } - agendaHeaderView.setDay(getItem(position).getInstanceDay(), mCurrentDayColor, getItem(position).getDayReference().getShowBadge()); - return agendaHeaderView; - } - - @Override - public long getHeaderId(int position) { - return mEvents.get(position).getInstanceDay().getTimeInMillis(); - } - - // endregion - - // region Class - BaseAdapter - - @Override - public int getCount() { - return mEvents.size(); - } - - @Override - public CalendarEvent getItem(int position) { - return mEvents.get(position); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - EventRenderer eventRenderer = new DefaultEventRenderer(); - final CalendarEvent event = getItem(position); - - // Search for the correct event renderer - for (EventRenderer renderer : mRenderers) { - if(event.getClass().isAssignableFrom(renderer.getRenderType())) { - eventRenderer = renderer; - break; - } - } - convertView = LayoutInflater.from(parent.getContext()) - .inflate(eventRenderer.getEventLayout(), parent, false); - eventRenderer.render(convertView, event); - return convertView; - } - - public void addEventRenderer(@NonNull final EventRenderer renderer) { - mRenderers.add(renderer); - } - - // endregion -} \ No newline at end of file diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaEventView.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaEventView.java deleted file mode 100644 index 198f65cd..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaEventView.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.github.tibolte.agendacalendarview.agenda; - -import com.github.tibolte.agendacalendarview.R; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.ViewGroup; -import android.widget.LinearLayout; - -/** - * List item view for the StickyHeaderListView of the agenda view - */ -public class AgendaEventView extends LinearLayout { - public static AgendaEventView inflate(ViewGroup parent) { - return (AgendaEventView) LayoutInflater.from(parent.getContext()).inflate(R.layout.view_agenda_event, parent, false); - } - - // region Constructors - - public AgendaEventView(Context context) { - this(context, null); - } - - public AgendaEventView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public AgendaEventView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - setPadding(getResources().getDimensionPixelSize(R.dimen.agenda_event_view_padding_left), - getResources().getDimensionPixelSize(R.dimen.agenda_event_view_padding_top), - getResources().getDimensionPixelSize(R.dimen.agenda_event_view_padding_right), - getResources().getDimensionPixelSize(R.dimen.agenda_event_view_padding_bottom)); - } - - // endregion -} \ No newline at end of file diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaHeaderView.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaHeaderView.java deleted file mode 100644 index 36b16ddb..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaHeaderView.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.github.tibolte.agendacalendarview.agenda; - -import com.github.tibolte.agendacalendarview.CalendarManager; -import com.github.tibolte.agendacalendarview.R; -import com.github.tibolte.agendacalendarview.utils.DateHelper; - -import android.content.Context; -import android.content.res.Resources; -import android.graphics.drawable.GradientDrawable; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.LinearLayout; -import android.widget.TextView; - -import java.text.SimpleDateFormat; -import java.util.Calendar; - -/** - * Header view for the StickyHeaderListView of the agenda view - */ -public class AgendaHeaderView extends LinearLayout { - - public static AgendaHeaderView inflate(ViewGroup parent) { - return (AgendaHeaderView) LayoutInflater.from(parent.getContext()).inflate(R.layout.view_agenda_header, parent, false); - } - - // region Constructors - - public AgendaHeaderView(Context context) { - super(context); - } - - public AgendaHeaderView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public AgendaHeaderView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - // endregion - - // region Public methods - - public void setDay(Calendar day, int currentDayTextColor, boolean showBadge) { - TextView txtDayOfMonth = (TextView) findViewById(R.id.view_agenda_day_of_month); - TextView txtDayOfWeek = (TextView) findViewById(R.id.view_agenda_day_of_week); - TextView txtDay = (TextView) findViewById(R.id.view_agenda_day_text); - View circleView = findViewById(R.id.view_day_circle_selected); - - Calendar today = CalendarManager.getInstance().getToday(); - - SimpleDateFormat dayWeekFormatter = new SimpleDateFormat(getContext().getString(R.string.day_name_format), CalendarManager.getInstance().getLocale()); - SimpleDateFormat dayWeekLongFormatter = new SimpleDateFormat("EEEE", CalendarManager.getInstance().getLocale()); - - txtDayOfMonth.setTextColor(getResources().getColor(R.color.calendar_text_default)); - txtDayOfWeek.setTextColor(getResources().getColor(R.color.calendar_text_default)); - - if (DateHelper.sameDate(day, today)) { - txtDayOfMonth.setTextColor(currentDayTextColor); - circleView.setVisibility(VISIBLE); - GradientDrawable drawable = (GradientDrawable) circleView.getBackground(); - drawable.setStroke((int) (2 * Resources.getSystem().getDisplayMetrics().density), currentDayTextColor); - } else if (showBadge) { - circleView.setVisibility(VISIBLE); - GradientDrawable drawable = (GradientDrawable) circleView.getBackground(); - drawable.setStroke((int) (2 * Resources.getSystem().getDisplayMetrics().density), 0xffff0000); - } - else { - circleView.setVisibility(INVISIBLE); - } - - txtDayOfMonth.setText(String.valueOf(day.get(Calendar.DAY_OF_MONTH))); - txtDayOfWeek.setText(dayWeekFormatter.format(day.getTime())); - //txtDay.setText(dayWeekLongFormatter.format(day.getTime())); - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaListView.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaListView.java deleted file mode 100644 index 235b04c6..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaListView.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.github.tibolte.agendacalendarview.agenda; - -import com.github.tibolte.agendacalendarview.CalendarManager; -import com.github.tibolte.agendacalendarview.models.CalendarEvent; -import com.github.tibolte.agendacalendarview.utils.DateHelper; - -import android.content.Context; -import android.util.AttributeSet; - -import java.util.Calendar; -import java.util.List; - -import se.emilsjolander.stickylistheaders.StickyListHeadersListView; - -/** - * StickyListHeadersListView to scroll chronologically through events. - */ -public class AgendaListView extends StickyListHeadersListView { - - // region Constructors - - public AgendaListView(Context context) { - super(context); - } - - public AgendaListView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public AgendaListView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - // endregion - - // region Public methods - - public void scrollToCurrentDate(Calendar today) { - List events = CalendarManager.getInstance().getEvents(); - - int toIndex = 0; - for (int i = 0; i < events.size(); i++) { - if (DateHelper.sameDate(today, events.get(i).getInstanceDay())) { - toIndex = i; - break; - } - } - - final int finalToIndex = toIndex; - post(()->setSelection(finalToIndex)); - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaView.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaView.java deleted file mode 100644 index 80b317da..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/agenda/AgendaView.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.github.tibolte.agendacalendarview.agenda; - -import android.animation.Animator; -import android.animation.ObjectAnimator; -import android.content.Context; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.MotionEvent; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewTreeObserver; -import android.widget.FrameLayout; - -import com.github.tibolte.agendacalendarview.CalendarManager; -import com.github.tibolte.agendacalendarview.R; -import com.github.tibolte.agendacalendarview.utils.BusProvider; -import com.github.tibolte.agendacalendarview.utils.Events; - -public class AgendaView extends FrameLayout { - - private AgendaListView mAgendaListView; - private View mShadowView; - - // region Constructors - - public AgendaView(Context context) { - super(context); - } - - public AgendaView(Context context, AttributeSet attrs) { - super(context, attrs); - - LayoutInflater inflater = (LayoutInflater) context - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - inflater.inflate(R.layout.view_agenda, this, true); - } - - // endregion - - // region Class - View - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - - mAgendaListView = (AgendaListView) findViewById(R.id.agenda_listview); - mShadowView = findViewById(R.id.view_shadow); - - BusProvider.getInstance().toObserverable() - .subscribe(event -> { - if (event instanceof Events.DayClickedEvent) { - Events.DayClickedEvent clickedEvent = (Events.DayClickedEvent) event; - getAgendaListView().scrollToCurrentDate(clickedEvent.getCalendar()); - } else if (event instanceof Events.CalendarScrolledEvent) { - int offset = (int) (3 * getResources().getDimension(R.dimen.day_cell_height)); - translateList(offset); - } else if (event instanceof Events.EventsFetched) { - if (getAgendaListView().getAdapter() != null) - ((AgendaAdapter) getAgendaListView().getAdapter()).updateEvents(CalendarManager.getInstance().getEvents()); - - getViewTreeObserver().addOnGlobalLayoutListener( - new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - if (getWidth() != 0 && getHeight() != 0) { - // display only two visible rows on the calendar view - ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) getLayoutParams(); - int height = getHeight(); - int margin = (int) (getContext().getResources().getDimension(R.dimen.calendar_header_height) + 2 * getContext().getResources().getDimension(R.dimen.day_cell_height)); - layoutParams.height = height; - layoutParams.setMargins(0, margin, 0, 0); - setLayoutParams(layoutParams); - - getAgendaListView().scrollToCurrentDate(CalendarManager.getInstance().getToday()); - - getViewTreeObserver().removeGlobalOnLayoutListener(this); - } - } - } - - ); - } else if (event instanceof Events.ForecastFetched) { - ((AgendaAdapter) getAgendaListView().getAdapter()).updateEvents(CalendarManager.getInstance().getEvents()); - } - }); - } - - @Override - public boolean dispatchTouchEvent(MotionEvent event) { - int eventaction = event.getAction(); - - switch (eventaction) { - case MotionEvent.ACTION_DOWN: - // if the user touches the listView, we put it back to the top - translateList(0); - break; - default: - break; - } - - return super.dispatchTouchEvent(event); - } - - // endregion - - // region Public methods - - public AgendaListView getAgendaListView() { - return mAgendaListView; - } - - public void translateList(int targetY) { - if (targetY != getTranslationY()) { - ObjectAnimator mover = ObjectAnimator.ofFloat(this, "translationY", targetY); - mover.setDuration(150); - mover.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - //mShadowView.setVisibility(GONE); - } - - @Override - public void onAnimationEnd(Animator animation) { - if (targetY == 0) { - BusProvider.getInstance().send(new Events.AgendaListViewTouchedEvent()); - } - //mShadowView.setVisibility(VISIBLE); - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }); - mover.start(); - } - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/calendar/CalendarView.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/calendar/CalendarView.java deleted file mode 100644 index 67d7490c..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/calendar/CalendarView.java +++ /dev/null @@ -1,279 +0,0 @@ -package com.github.tibolte.agendacalendarview.calendar; - -import com.github.tibolte.agendacalendarview.CalendarManager; -import com.github.tibolte.agendacalendarview.R; -import com.github.tibolte.agendacalendarview.calendar.weekslist.WeekListView; -import com.github.tibolte.agendacalendarview.calendar.weekslist.WeeksAdapter; -import com.github.tibolte.agendacalendarview.models.CalendarEvent; -import com.github.tibolte.agendacalendarview.models.IDayItem; -import com.github.tibolte.agendacalendarview.models.IWeekItem; -import com.github.tibolte.agendacalendarview.utils.BusProvider; -import com.github.tibolte.agendacalendarview.utils.DateHelper; -import com.github.tibolte.agendacalendarview.utils.Events; - -import android.content.Context; -import androidx.recyclerview.widget.LinearLayoutManager; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.ViewGroup; -import android.view.ViewTreeObserver; -import android.widget.LinearLayout; -import android.widget.TextView; - -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.List; -import java.util.Locale; - -/** - * The calendar view is a freely scrolling view that allows the user to browse between days of the - * year. - */ -public class CalendarView extends LinearLayout { - - private static final String LOG_TAG = CalendarView.class.getSimpleName(); - - /** - * Top of the calendar view layout, the week days list - */ - private LinearLayout mDayNamesHeader; - /** - * Part of the calendar view layout always visible, the weeks list - */ - private WeekListView mListViewWeeks; - /** - * The adapter for the weeks list - */ - private WeeksAdapter mWeeksAdapter; - /** - * The current highlighted day in blue - */ - private IDayItem mSelectedDay; - /** - * The current row displayed at top of the list - */ - private int mCurrentListPosition; - - // region Constructors - - public CalendarView(Context context) { - super(context); - } - - public CalendarView(Context context, AttributeSet attrs) { - super(context, attrs); - - LayoutInflater inflater = (LayoutInflater) context - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - inflater.inflate(R.layout.view_calendar, this, true); - - setOrientation(VERTICAL); - } - - // endregion - - public IDayItem getSelectedDay() { - return mSelectedDay; - } - - public void setSelectedDay(IDayItem mSelectedDay) { - this.mSelectedDay = mSelectedDay; - } - - public WeekListView getListViewWeeks() { - return mListViewWeeks; - } - - // region Class - View - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - - mDayNamesHeader = (LinearLayout) findViewById(R.id.cal_day_names); - mListViewWeeks = (WeekListView) findViewById(R.id.list_week); - mListViewWeeks.setLayoutManager(new LinearLayoutManager(getContext())); - mListViewWeeks.setHasFixedSize(true); - mListViewWeeks.setItemAnimator(null); - mListViewWeeks.setSnapEnabled(true); - - // display only two visible rows on the calendar view - getViewTreeObserver().addOnGlobalLayoutListener( - new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - if (getWidth() != 0 && getHeight() != 0) { - collapseCalendarView(); - getViewTreeObserver().removeGlobalOnLayoutListener(this); - } - } - } - ); - } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - - BusProvider.getInstance().toObserverable() - .subscribe(event -> { - if (event instanceof Events.CalendarScrolledEvent) { - expandCalendarView(); - } else if (event instanceof Events.AgendaListViewTouchedEvent) { - collapseCalendarView(); - } else if (event instanceof Events.DayClickedEvent) { - Events.DayClickedEvent clickedEvent = (Events.DayClickedEvent) event; - updateSelectedDay(clickedEvent.getCalendar(), clickedEvent.getDay()); - } - }); - } - - // endregion - - // region Public methods - - public void init(CalendarManager calendarManager, int dayTextColor, int currentDayTextColor, int pastDayTextColor, List eventList) { - Calendar today = calendarManager.getToday(); - Locale locale = calendarManager.getLocale(); - SimpleDateFormat weekDayFormatter = calendarManager.getWeekdayFormatter(); - List weeks = calendarManager.getWeeks(); - - setUpHeader(today, weekDayFormatter, locale); - setUpAdapter(today, weeks, dayTextColor, currentDayTextColor, pastDayTextColor, eventList); - scrollToDate(today, weeks); - } - - /** - * Fired when the Agenda list view changes section. - * - * @param calendarEvent The event for the selected position in the agenda listview. - */ - public void scrollToDate(final CalendarEvent calendarEvent) { - mListViewWeeks.post(()->scrollToPosition(updateSelectedDay(calendarEvent.getInstanceDay(), calendarEvent.getDayReference()))); - } - - public void scrollToDate(Calendar today, List weeks) { - Integer currentWeekIndex = null; - - for (int c = 0; c < weeks.size(); c++) { - if (DateHelper.sameWeek(today, weeks.get(c))) { - currentWeekIndex = c; - break; - } - } - - if (currentWeekIndex != null) { - final Integer finalCurrentWeekIndex = currentWeekIndex; - mListViewWeeks.post(() -> scrollToPosition(finalCurrentWeekIndex)); - } - } - - public void setBackgroundColor(int color) { - mListViewWeeks.setBackgroundColor(color); - } - - // endregion - - // region Private methods - - private void scrollToPosition(int targetPosition) { - LinearLayoutManager layoutManager = ((LinearLayoutManager) mListViewWeeks.getLayoutManager()); - layoutManager.scrollToPosition(targetPosition); - } - - private void updateItemAtPosition(int position) { - WeeksAdapter weeksAdapter = (WeeksAdapter) mListViewWeeks.getAdapter(); - weeksAdapter.notifyItemChanged(position); - } - - /** - * Creates a new adapter if necessary and sets up its parameters. - */ - private void setUpAdapter(Calendar today, List weeks, int dayTextColor, int currentDayTextColor, int pastDayTextColor, List events) { - BusProvider.getInstance().toObserverable() - .subscribe(event -> { - if (event instanceof Events.EventsFetched) { - //Log.d("CalendarView", "events size "+events.size()); - if (mWeeksAdapter == null) { - //Log.d(LOG_TAG, "Setting adapter with today's calendar: " + today.toString()); - mWeeksAdapter = new WeeksAdapter(getContext(), today, dayTextColor, currentDayTextColor, pastDayTextColor, events); - mListViewWeeks.setAdapter(mWeeksAdapter); - } - mWeeksAdapter.updateWeeksItems(weeks); - }}); - - } - - private void setUpHeader(Calendar today, SimpleDateFormat weekDayFormatter, Locale locale) { - int daysPerWeek = 7; - String[] dayLabels = new String[daysPerWeek]; - Calendar cal = Calendar.getInstance(CalendarManager.getInstance(getContext()).getLocale()); - cal.setTime(today.getTime()); - int firstDayOfWeek = cal.getFirstDayOfWeek(); - for (int count = 0; count < 7; count++) { - cal.set(Calendar.DAY_OF_WEEK, firstDayOfWeek + count); - if (locale.getLanguage().equals("en")) { - dayLabels[count] = weekDayFormatter.format(cal.getTime()).toUpperCase(locale); - } else { - dayLabels[count] = weekDayFormatter.format(cal.getTime()); - } - } - - for (int i = 0; i < mDayNamesHeader.getChildCount(); i++) { - TextView txtDay = (TextView) mDayNamesHeader.getChildAt(i); - txtDay.setText(dayLabels[i]); - } - } - - private void expandCalendarView() { - ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) getLayoutParams(); - layoutParams.height = (int) (getResources().getDimension(R.dimen.calendar_header_height) + 5 * getResources().getDimension(R.dimen.day_cell_height)); - setLayoutParams(layoutParams); - } - - private void collapseCalendarView() { - ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) getLayoutParams(); - layoutParams.height = (int) (getResources().getDimension(R.dimen.calendar_header_height) + 2 * getResources().getDimension(R.dimen.day_cell_height)); - setLayoutParams(layoutParams); - } - - /** - * Update a selected cell day item. - * - * @param calendar The Calendar instance of the day selected. - * @param dayItem The DayItem information held by the cell item. - * @return The selected row of the weeks list, to be updated. - */ - private int updateSelectedDay(Calendar calendar, IDayItem dayItem) { - Integer currentWeekIndex = null; - - // update highlighted/selected day - if (!dayItem.equals(getSelectedDay())) { - dayItem.setSelected(true); - if (getSelectedDay() != null) { - getSelectedDay().setSelected(false); - } - setSelectedDay(dayItem); - } - - for (int c = 0; c < CalendarManager.getInstance().getWeeks().size(); c++) { - if (DateHelper.sameWeek(calendar, CalendarManager.getInstance().getWeeks().get(c))) { - currentWeekIndex = c; - break; - } - } - - if (currentWeekIndex != null) { - // highlighted day has changed, update the rows concerned - if (currentWeekIndex != mCurrentListPosition) { - updateItemAtPosition(mCurrentListPosition); - } - mCurrentListPosition = currentWeekIndex; - updateItemAtPosition(currentWeekIndex); - } - - return mCurrentListPosition; - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/calendar/weekslist/WeekListView.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/calendar/weekslist/WeekListView.java deleted file mode 100644 index 099bc6eb..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/calendar/weekslist/WeekListView.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.github.tibolte.agendacalendarview.calendar.weekslist; - -import com.github.tibolte.agendacalendarview.utils.BusProvider; -import com.github.tibolte.agendacalendarview.utils.Events; - -import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; -import android.util.AttributeSet; -import android.view.View; - -public class WeekListView extends RecyclerView { - private boolean mUserScrolling = false; - private boolean mScrolling = false; - - // region Constructors - - public WeekListView(Context context) { - super(context); - } - - public WeekListView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public WeekListView(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - // endregion - - // region Public methods - - /** - * Enable snapping behaviour for this recyclerView - * - * @param enabled enable or disable the snapping behaviour - */ - public void setSnapEnabled(boolean enabled) { - if (enabled) { - addOnScrollListener(mScrollListener); - } else { - removeOnScrollListener(mScrollListener); - } - } - - // endregion - - // region Private methods - - private OnScrollListener mScrollListener = new OnScrollListener() { - @Override - public void onScrolled(RecyclerView recyclerView, int dx, int dy) { - super.onScrolled(recyclerView, dx, dy); - } - - @Override - public void onScrollStateChanged(RecyclerView recyclerView, int newState) { - super.onScrollStateChanged(recyclerView, newState); - final WeeksAdapter weeksAdapter = (WeeksAdapter) getAdapter(); - - switch (newState) { - case SCROLL_STATE_IDLE: - if (mUserScrolling) { - scrollToView(getCenterView()); - postDelayed(() -> weeksAdapter.setDragging(false), 700); // Wait for recyclerView to settle - } - - mUserScrolling = false; - mScrolling = false; - break; - // If scroll is caused by a touch (scroll touch, not any touch) - case SCROLL_STATE_DRAGGING: - BusProvider.getInstance().send(new Events.CalendarScrolledEvent()); - // If scroll was initiated already, this is not a user scrolling, but probably a tap, else set userScrolling - if (!mScrolling) { - mUserScrolling = true; - } - weeksAdapter.setDragging(true); - break; - case SCROLL_STATE_SETTLING: - // The user's finger is not touching the list anymore, no need - // for any alpha animation then - weeksAdapter.setAlphaSet(true); - mScrolling = true; - break; - } - } - }; - - private View getChildClosestToPosition(int y) { - if (getChildCount() <= 0) { - return null; - } - - int itemHeight = getChildAt(0).getMeasuredHeight(); - - int closestY = 9999; - View closestChild = null; - - for (int i = 0; i < getChildCount(); i++) { - View child = getChildAt(i); - - int childCenterY = ((int) child.getY() + (itemHeight / 2)); - int yDistance = childCenterY - y; - - // If child center is closer than previous closest, set it as closest - if (Math.abs(yDistance) < Math.abs(closestY)) { - closestY = yDistance; - closestChild = child; - } - } - - return closestChild; - } - - private View getCenterView() { - return getChildClosestToPosition(getMeasuredHeight() / 2); - } - - private void scrollToView(View child) { - if (child == null) { - return; - } - - stopScroll(); - - int scrollDistance = getScrollDistance(child); - - if (scrollDistance != 0) { - smoothScrollBy(0, scrollDistance); - } - } - - private int getScrollDistance(View child) { - int itemHeight = getChildAt(0).getMeasuredHeight(); - int centerY = getMeasuredHeight() / 2; - - int childCenterY = ((int) child.getY() + (itemHeight / 2)); - - return childCenterY - centerY; - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/calendar/weekslist/WeeksAdapter.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/calendar/weekslist/WeeksAdapter.java deleted file mode 100644 index df2177df..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/calendar/weekslist/WeeksAdapter.java +++ /dev/null @@ -1,321 +0,0 @@ -package com.github.tibolte.agendacalendarview.calendar.weekslist; - -import com.github.tibolte.agendacalendarview.CalendarManager; -import com.github.tibolte.agendacalendarview.R; -import com.github.tibolte.agendacalendarview.models.CalendarEvent; -import com.github.tibolte.agendacalendarview.models.IDayItem; -import com.github.tibolte.agendacalendarview.models.IWeekItem; -import com.github.tibolte.agendacalendarview.utils.BusProvider; -import com.github.tibolte.agendacalendarview.utils.DateHelper; -import com.github.tibolte.agendacalendarview.utils.Events; - -import android.animation.Animator; -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffColorFilter; -import android.graphics.Typeface; -import android.graphics.drawable.GradientDrawable; - -import androidx.recyclerview.widget.RecyclerView; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.FrameLayout; -import android.widget.LinearLayout; -import android.widget.TextView; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -public class WeeksAdapter extends RecyclerView.Adapter { - - public static final long FADE_DURATION = 250; - - private Context mContext; - private Calendar mToday; - private List mWeeksList = new ArrayList<>(); - private List mEventList = new ArrayList<>(); - private boolean mDragging; - private boolean mAlphaSet; - private int mDayTextColor, mPastDayTextColor, mCurrentDayColor; - - // region Constructor - - public WeeksAdapter(Context context, Calendar today, int dayTextColor, int currentDayTextColor, int pastDayTextColor, List events) { - this.mToday = today; - this.mContext = context; - this.mDayTextColor = dayTextColor; - this.mCurrentDayColor = currentDayTextColor; - this.mPastDayTextColor = pastDayTextColor; - this.mEventList = events; - } - - // endregion - - public void updateWeeksItems(List weekItems) { - this.mWeeksList.clear(); - this.mWeeksList.addAll(weekItems); - notifyDataSetChanged(); - } - - // region Getters/setters - - public List getWeeksList() { - return mWeeksList; - } - - public boolean isDragging() { - return mDragging; - } - - public void setDragging(boolean dragging) { - if (dragging != this.mDragging) { - this.mDragging = dragging; - notifyItemRangeChanged(0, mWeeksList.size()); - } - } - - public boolean isAlphaSet() { - return mAlphaSet; - } - - public void setAlphaSet(boolean alphaSet) { - mAlphaSet = alphaSet; - } - - // endregion - - // region RecyclerView.Adapter methods - - @Override - public WeekViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_week, parent, false); - return new WeekViewHolder(view); - } - - @Override - public void onBindViewHolder(WeekViewHolder weekViewHolder, int position) { - IWeekItem weekItem = mWeeksList.get(position); - weekViewHolder.bindWeek(weekItem, mToday); - } - - @Override - public int getItemCount() { - return mWeeksList.size(); - } - - // endregion - - // region Class - WeekViewHolder - - public class WeekViewHolder extends RecyclerView.ViewHolder { - - /** - * List of layout containers for each day - */ - private List mCells; - private TextView mTxtMonth; - private FrameLayout mMonthBackground; - - public WeekViewHolder(View itemView) { - super(itemView); - mTxtMonth = (TextView) itemView.findViewById(R.id.month_label); - mMonthBackground = (FrameLayout) itemView.findViewById(R.id.month_background); - LinearLayout daysContainer = (LinearLayout) itemView.findViewById(R.id.week_days_container); - setUpChildren(daysContainer); - } - - public void bindWeek(IWeekItem weekItem, Calendar today) { - setUpMonthOverlay(); - - List dayItems = weekItem.getDayItems(); - - for (int c = 0; c < dayItems.size(); c++) { - final IDayItem dayItem = dayItems.get(c); - LinearLayout cellItem = mCells.get(c); - TextView txtDay = (TextView) cellItem.findViewById(R.id.view_day_day_label); - TextView txtMonth = (TextView) cellItem.findViewById(R.id.view_day_month_label); - View circleView = cellItem.findViewById(R.id.view_day_circle_selected); - View eventIndicator1 = cellItem.findViewById(R.id.view_day_event_indicator1); - View eventIndicator2 = cellItem.findViewById(R.id.view_day_event_indicator2); - View eventIndicator3 = cellItem.findViewById(R.id.view_day_event_indicator3); - cellItem.setOnClickListener(v->BusProvider.getInstance().send(new Events.DayClickedEvent(dayItem))); - - eventIndicator1.setVisibility(View.INVISIBLE); - eventIndicator2.setVisibility(View.INVISIBLE); - eventIndicator3.setVisibility(View.INVISIBLE); - - Calendar dayItemCalendar = Calendar.getInstance(); - dayItemCalendar.setTime(dayItem.getDate()); - int eventCount = 0; - for (CalendarEvent event: mEventList) { - if (event.getStartTime().get(Calendar.YEAR) == dayItemCalendar.get(Calendar.YEAR) - && event.getStartTime().get(Calendar.MONTH) == dayItemCalendar.get(Calendar.MONTH) - && event.getStartTime().get(Calendar.DAY_OF_MONTH) == dayItemCalendar.get(Calendar.DAY_OF_MONTH)) { - eventCount++; - if (eventCount == 1) { - eventIndicator1.setVisibility(View.VISIBLE); - eventIndicator1.getBackground().setColorFilter(new PorterDuffColorFilter(event.getColor(),PorterDuff.Mode.MULTIPLY)); - } - if (eventCount == 2) { - eventIndicator2.setVisibility(View.VISIBLE); - eventIndicator2.getBackground().setColorFilter(new PorterDuffColorFilter(event.getColor(),PorterDuff.Mode.MULTIPLY)); - } - if (eventCount == 3) { - eventIndicator3.setVisibility(View.VISIBLE); - eventIndicator3.getBackground().setColorFilter(new PorterDuffColorFilter(event.getColor(),PorterDuff.Mode.MULTIPLY)); - } - } - } - - //Log.d("CalendarView", "Event count for day "+dayItem.getValue()+" is "+eventCount); - - txtMonth.setVisibility(View.GONE); - txtDay.setTextColor(mDayTextColor); - txtMonth.setTextColor(mDayTextColor); - circleView.setVisibility(View.GONE); - - txtDay.setTypeface(null, Typeface.NORMAL); - txtMonth.setTypeface(null, Typeface.NORMAL); - - // Display the day - txtDay.setText(Integer.toString(dayItem.getValue())); - - // Highlight first day of the month - if (dayItem.isFirstDayOfTheMonth() && !dayItem.isSelected()) { - txtMonth.setVisibility(View.VISIBLE); - txtMonth.setText(dayItem.getMonth()); - txtDay.setTypeface(null, Typeface.BOLD); - txtMonth.setTypeface(null, Typeface.BOLD); - } - - // Check if this day is in the past - if (today.getTime().after(dayItem.getDate()) && !DateHelper.sameDate(today, dayItem.getDate())) { - txtDay.setTextColor(mPastDayTextColor); - txtMonth.setTextColor(mPastDayTextColor); - } - - // Highlight the cell if this day is today - if (dayItem.isToday() && !dayItem.isSelected()) { - txtDay.setTextColor(mCurrentDayColor); - } - - if (dayItem.getShowBadge()) { - circleView.setVisibility(View.VISIBLE); - GradientDrawable drawable = (GradientDrawable) circleView.getBackground(); - drawable.setStroke((int) (2 * Resources.getSystem().getDisplayMetrics().density), 0xffff0000); - } - - // Show a circle if the day is selected - if (dayItem.isSelected()) { - txtDay.setTextColor(mDayTextColor); - circleView.setVisibility(View.VISIBLE); - GradientDrawable drawable = (GradientDrawable) circleView.getBackground(); - drawable.setStroke((int) (1 * Resources.getSystem().getDisplayMetrics().density), mDayTextColor); - } - - // Check if the month label has to be displayed - if (dayItem.getValue() == 15) { - mTxtMonth.setVisibility(View.VISIBLE); - SimpleDateFormat monthDateFormat = new SimpleDateFormat(mContext.getResources().getString(R.string.month_name_format), CalendarManager.getInstance().getLocale()); - String month = monthDateFormat.format(weekItem.getDate()).toUpperCase(); - if (today.get(Calendar.YEAR) != weekItem.getYear()) { - month = month + String.format(" %d", weekItem.getYear()); - } - mTxtMonth.setText(month); - } - } - } - - private void setUpChildren(LinearLayout daysContainer) { - mCells = new ArrayList<>(); - for (int i = 0; i < daysContainer.getChildCount(); i++) { - mCells.add((LinearLayout) daysContainer.getChildAt(i)); - } - } - - private void setUpMonthOverlay() { - mTxtMonth.setVisibility(View.GONE); - - if (isDragging()) { - AnimatorSet animatorSetFadeIn = new AnimatorSet(); - animatorSetFadeIn.setDuration(FADE_DURATION); - ObjectAnimator animatorTxtAlphaIn = ObjectAnimator.ofFloat(mTxtMonth, "alpha", mTxtMonth.getAlpha(), 1f); - ObjectAnimator animatorBackgroundAlphaIn = ObjectAnimator.ofFloat(mMonthBackground, "alpha", mMonthBackground.getAlpha(), 1f); - animatorSetFadeIn.playTogether( - animatorTxtAlphaIn - //animatorBackgroundAlphaIn - ); - animatorSetFadeIn.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - - } - - @Override - public void onAnimationEnd(Animator animation) { - setAlphaSet(true); - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }); - animatorSetFadeIn.start(); - } else { - AnimatorSet animatorSetFadeOut = new AnimatorSet(); - animatorSetFadeOut.setDuration(FADE_DURATION); - ObjectAnimator animatorTxtAlphaOut = ObjectAnimator.ofFloat(mTxtMonth, "alpha", mTxtMonth.getAlpha(), 0f); - ObjectAnimator animatorBackgroundAlphaOut = ObjectAnimator.ofFloat(mMonthBackground, "alpha", mMonthBackground.getAlpha(), 0f); - animatorSetFadeOut.playTogether( - animatorTxtAlphaOut - //animatorBackgroundAlphaOut - ); - animatorSetFadeOut.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - - } - - @Override - public void onAnimationEnd(Animator animation) { - setAlphaSet(false); - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }); - animatorSetFadeOut.start(); - } - - if (isAlphaSet()) { - //mMonthBackground.setAlpha(1f); - mTxtMonth.setAlpha(1f); - } else { - //mMonthBackground.setAlpha(0f); - mTxtMonth.setAlpha(0f); - } - } - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/BaseCalendarEvent.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/BaseCalendarEvent.java deleted file mode 100644 index 642eea2c..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/BaseCalendarEvent.java +++ /dev/null @@ -1,345 +0,0 @@ -package com.github.tibolte.agendacalendarview.models; - -import java.util.Calendar; - -/** - * Event model class containing the information to be displayed on the agenda view. - */ -public class BaseCalendarEvent implements CalendarEvent { - - /** - * Id of the event. - */ - private long mId; - /** - * Color to be displayed in the agenda view. - */ - private int mColor; - /** - * Text color displayed on the background color - */ - private int mTextColor; - /** - * Title of the event. - */ - private String mTitle; - /** - * Description of the event. - */ - private String mDescription; - /** - * Where the event takes place. - */ - private String mLocation; - /** - * Calendar instance helping sorting the events per section in the agenda view. - */ - private Calendar mInstanceDay; - /** - * Start time of the event. - */ - private Calendar mStartTime; - /** - * End time of the event. - */ - private Calendar mEndTime; - /** - * Indicates if the event lasts all day. - */ - private boolean mAllDay; - /** - * Tells if this BaseCalendarEvent instance is used as a placeholder in the agenda view, if there's - * no event for that day. - */ - private boolean mPlaceHolder; - /** - * Tells if this BaseCalendarEvent instance is used as a forecast information holder in the agenda - * view. - */ - private boolean mWeather; - /** - * Duration of the event. - */ - private String mDuration; - /** - * References to a DayItem instance for that event, used to link interaction between the - * calendar view and the agenda view. - */ - private IDayItem mDayReference; - /** - * References to a WeekItem instance for that event, used to link interaction between the - * calendar view and the agenda view. - */ - private IWeekItem mWeekReference; - /** - * Weather icon string returned by the Dark Sky API. - */ - private String mWeatherIcon; - /** - * Temperature value returned by the Dark Sky API. - */ - private double mTemperature; - - private boolean mShowBadge; - - // region Constructor - - /** - * Initializes the event - * - * @param id The id of the event. - * @param color The color of the event. - * @param textColor The color of the event description text. - * @param title The title of the event. - * @param description The description of the event. - * @param location The location of the event. - * @param dateStart The start date of the event. - * @param dateEnd The end date of the event. - * @param allDay Int that can be equal to 0 or 1. - * @param duration The duration of the event in RFC2445 format. - */ - public BaseCalendarEvent(long id, int color, int textColor, String title, String description, String location, long dateStart, long dateEnd, int allDay, String duration) { - this.mId = id; - this.mColor = color; - this.mTextColor = textColor; - this.mAllDay = (allDay == 1); - this.mDuration = duration; - this.mTitle = title; - this.mDescription = description; - this.mLocation = location; - - this.mStartTime = Calendar.getInstance(); - this.mStartTime.setTimeInMillis(dateStart); - this.mEndTime = Calendar.getInstance(); - this.mEndTime.setTimeInMillis(dateEnd); - } - - public BaseCalendarEvent() { - - } - - /** - * Initializes the event - * @param title The title of the event. - * @param description The description of the event. - * @param location The location of the event. - * @param color The color of the event (for display in the app). - * @param textColor The color of the event description text. - * @param startTime The start time of the event. - * @param endTime The end time of the event. - * @param allDay Indicates if the event lasts the whole day. - */ - public BaseCalendarEvent(String title, String description, String location, int color, int textColor, Calendar startTime, Calendar endTime, boolean allDay) { - this.mTitle = title; - this.mDescription = description; - this.mLocation = location; - this.mColor = color; - this.mTextColor = textColor; - this.mStartTime = startTime; - this.mEndTime = endTime; - this.mAllDay = allDay; - } - - public BaseCalendarEvent(String title, String description, String location, int color, int textColor, Calendar startTime, Calendar endTime, boolean allDay, long id, boolean showBadge) { - this.mTitle = title; - this.mDescription = description; - this.mLocation = location; - this.mColor = color; - this.mTextColor = textColor; - this.mStartTime = startTime; - this.mEndTime = endTime; - this.mAllDay = allDay; - this.mId = id; - this.mShowBadge = showBadge; - } - - public BaseCalendarEvent(BaseCalendarEvent calendarEvent) { - this.mId = calendarEvent.getId(); - this.mColor = calendarEvent.getColor(); - this.mTextColor = calendarEvent.getTextColor(); - this.mAllDay = calendarEvent.isAllDay(); - this.mDuration = calendarEvent.getDuration(); - this.mTitle = calendarEvent.getTitle(); - this.mDescription = calendarEvent.getDescription(); - this.mLocation = calendarEvent.getLocation(); - this.mStartTime = calendarEvent.getStartTime(); - this.mEndTime = calendarEvent.getEndTime(); - this.mShowBadge = calendarEvent.getShowBadge(); - } - - // endregion - - // region Getters/Setters - - public int getColor() { - return mColor; - } - - public void setColor(int mColor) { - this.mColor = mColor; - } - - public int getTextColor() { - return mTextColor; - } - - public void setTextColor(int mTextColor) { - this.mTextColor = mTextColor; - } - - public String getDescription() { - return mDescription; - } - - public boolean isAllDay() { - return mAllDay; - } - - public void setAllDay(boolean allDay) { - this.mAllDay = allDay; - } - - public void setDescription(String mDescription) { - this.mDescription = mDescription; - } - - public Calendar getInstanceDay() { - return mInstanceDay; - } - - public void setInstanceDay(Calendar mInstanceDay) { - this.mInstanceDay = mInstanceDay; - this.mInstanceDay.set(Calendar.HOUR, 0); - this.mInstanceDay.set(Calendar.MINUTE, 0); - this.mInstanceDay.set(Calendar.SECOND, 0); - this.mInstanceDay.set(Calendar.MILLISECOND, 0); - this.mInstanceDay.set(Calendar.AM_PM, 0); - } - - public Calendar getEndTime() { - return mEndTime; - } - - public void setEndTime(Calendar mEndTime) { - this.mEndTime = mEndTime; - } - public void setPlaceholder(boolean placeholder) { - mPlaceHolder = placeholder; - } - public boolean isPlaceholder() { - return mPlaceHolder; - } - - public long getId() { - return mId; - } - - public void setId(long mId) { - this.mId = mId; - } - - public boolean getShowBadge() { - return mShowBadge; - } - - public void setShowBadge(boolean mShowBadge) { - this.mShowBadge = mShowBadge; - } - - public String getLocation() { - return mLocation; - } - - public void setLocation(String mLocation) { - this.mLocation = mLocation; - } - - public Calendar getStartTime() { - return mStartTime; - } - - public void setStartTime(Calendar mStartTime) { - this.mStartTime = mStartTime; - } - - public String getTitle() { - return mTitle; - } - - public void setTitle(String mTitle) { - this.mTitle = mTitle; - } - - public String getDuration() { - return mDuration; - } - - public void setDuration(String duration) { - this.mDuration = duration; - } - - public boolean isPlaceHolder() { - return mPlaceHolder; - } - - public void setPlaceHolder(boolean mPlaceHolder) { - this.mPlaceHolder = mPlaceHolder; - } - - public boolean isWeather() { - return mWeather; - } - - public void setWeather(boolean mWeather) { - this.mWeather = mWeather; - } - - public IDayItem getDayReference() { - return mDayReference; - } - - public void setDayReference(IDayItem mDayReference) { - this.mDayReference = mDayReference; - } - - public IWeekItem getWeekReference() { - return mWeekReference; - } - - public void setWeekReference(IWeekItem mWeekReference) { - this.mWeekReference = mWeekReference; - } - - public String getWeatherIcon() { - return mWeatherIcon; - } - - public void setWeatherIcon(String mWeatherIcon) { - this.mWeatherIcon = mWeatherIcon; - } - - public double getTemperature() { - return mTemperature; - } - - public void setTemperature(double mTemperature) { - this.mTemperature = mTemperature; - } - - @Override - public CalendarEvent copy() { - return new BaseCalendarEvent(this); - } - - // endregion - - @Override - public String toString() { - return "BaseCalendarEvent{" - + "title='" - + mTitle - + ", instanceDay= " - + mInstanceDay.getTime() - + "}"; - } -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/CalendarEvent.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/CalendarEvent.java deleted file mode 100644 index 05df9a0f..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/CalendarEvent.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.github.tibolte.agendacalendarview.models; - -import java.util.Calendar; - -public interface CalendarEvent { - - - void setPlaceholder(boolean placeholder); - - boolean isPlaceholder(); - - public String getLocation(); - - public void setLocation(String mLocation); - - long getId(); - - void setId(long mId); - - boolean getShowBadge(); - - void setShowBadge(boolean mShowBadge); - - int getTextColor(); - - void setTextColor(int mTextColor); - - String getDescription(); - - void setDescription(String mDescription); - - boolean isAllDay(); - - void setAllDay(boolean allDay); - - Calendar getStartTime(); - - void setStartTime(Calendar mStartTime); - - Calendar getEndTime(); - - void setEndTime(Calendar mEndTime); - - String getTitle(); - - void setTitle(String mTitle); - - Calendar getInstanceDay(); - - void setInstanceDay(Calendar mInstanceDay); - - IDayItem getDayReference(); - - void setDayReference(IDayItem mDayReference); - - IWeekItem getWeekReference(); - - void setWeekReference(IWeekItem mWeekReference); - - CalendarEvent copy(); - - int getColor(); -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/DayItem.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/DayItem.java deleted file mode 100644 index 39be4985..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/DayItem.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.github.tibolte.agendacalendarview.models; - -import com.github.tibolte.agendacalendarview.CalendarManager; -import com.github.tibolte.agendacalendarview.utils.DateHelper; - -import java.util.Calendar; -import java.util.Date; - -/** - * Day model class. - */ -public class DayItem implements IDayItem { - private Date mDate; - private int mValue; - private int mDayOfTheWeek; - private boolean mToday; - private boolean mFirstDayOfTheMonth; - private boolean mSelected; - private String mMonth; - private boolean mShowBadge; - - // region Constructor - - public DayItem(Date date, int value, boolean today, String month) { - this.mDate = date; - this.mValue = value; - this.mToday = today; - this.mMonth = month; - } - // only for cleanDay - public DayItem() { - - } - public DayItem(DayItem original) { - - this.mDate = original.getDate(); - this.mValue = original.getValue(); - this.mToday = original.isToday(); - this.mDayOfTheWeek = original.getDayOftheWeek(); - this.mFirstDayOfTheMonth = original.isFirstDayOfTheMonth(); - this.mSelected = original.isSelected(); - this.mMonth = original.getMonth(); - this.mShowBadge = original.mShowBadge; - } - // endregion - - // region Getters/Setters - - public Date getDate() { - return mDate; - } - - public void setDate(Date date) { - this.mDate = date; - } - - public int getValue() { - return mValue; - } - - public void setValue(int value) { - this.mValue = value; - } - - public boolean isToday() { - return mToday; - } - - public void setToday(boolean today) { - this.mToday = today; - } - - public boolean isSelected() { - return mSelected; - } - - public void setSelected(boolean selected) { - this.mSelected = selected; - } - - public boolean isFirstDayOfTheMonth() { - return mFirstDayOfTheMonth; - } - - public void setFirstDayOfTheMonth(boolean firstDayOfTheMonth) { - this.mFirstDayOfTheMonth = firstDayOfTheMonth; - } - - public String getMonth() { - return mMonth; - } - - public void setMonth(String month) { - this.mMonth = month; - } - - public int getDayOftheWeek() { - return mDayOfTheWeek; - } - - public void setDayOftheWeek(int mDayOftheWeek) { - this.mDayOfTheWeek = mDayOftheWeek; - } - - public void setShowBadge(boolean showBadge) { - this.mShowBadge = showBadge; - } - - public boolean getShowBadge() { - return this.mShowBadge; - } - - // region Public methods - - public void buildDayItemFromCal(Calendar calendar) { - Date date = calendar.getTime(); - this.mDate = date; - - this.mValue = calendar.get(Calendar.DAY_OF_MONTH); - this.mToday = DateHelper.sameDate(calendar, CalendarManager.getInstance().getToday()); - this.mMonth = CalendarManager.getInstance().getMonthHalfNameFormat().format(date); - if (this.mValue == 1) { - this.mFirstDayOfTheMonth = true; - } - } - - // endregion - - @Override - public String toString() { - return "DayItem{" - + "Date='" - + mDate.toString() - + ", value=" - + mValue - + '}'; - } - - @Override - public IDayItem copy() { - return new DayItem(this); - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/IDayItem.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/IDayItem.java deleted file mode 100644 index acfe3c76..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/IDayItem.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.github.tibolte.agendacalendarview.models; - -import java.util.Calendar; -import java.util.Date; - -public interface IDayItem { - - // region Getters/Setters - - Date getDate(); - - void setDate(Date date); - - int getValue(); - - void setValue(int value); - - boolean isToday(); - - void setToday(boolean today); - - boolean isSelected(); - - void setSelected(boolean selected); - - boolean isFirstDayOfTheMonth(); - - void setFirstDayOfTheMonth(boolean firstDayOfTheMonth); - - String getMonth(); - - void setMonth(String month); - - int getDayOftheWeek(); - - void setDayOftheWeek(int mDayOftheWeek); - - // endregion - - void buildDayItemFromCal(Calendar calendar); - - String toString(); - - IDayItem copy(); - - void setShowBadge(boolean showBadge); - - boolean getShowBadge(); -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/IWeekItem.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/IWeekItem.java deleted file mode 100644 index bb08b89a..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/IWeekItem.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.github.tibolte.agendacalendarview.models; - -import java.util.Date; -import java.util.List; - -public interface IWeekItem { - - - int getWeekInYear(); - - void setWeekInYear(int weekInYear); - - int getYear(); - - void setYear(int year); - - int getMonth(); - - void setMonth(int month); - - Date getDate(); - - void setDate(Date date); - - String getLabel(); - - void setLabel(String label); - - List getDayItems(); - - void setDayItems(List dayItems); - - IWeekItem copy(); -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/WeekItem.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/WeekItem.java deleted file mode 100644 index 40b94902..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/models/WeekItem.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.github.tibolte.agendacalendarview.models; - -import java.util.Date; -import java.util.List; - -/** - * Week model class. - */ -public class WeekItem implements IWeekItem { - private int mWeekInYear; - private int mYear; - private int mMonth; - private Date mDate; - private String mLabel; - private List mDayItems; - - // region Constructor - - public WeekItem(int weekInYear, int year, Date date, String label, int month) { - this.mWeekInYear = weekInYear; - this.mYear = year; - this.mDate = date; - this.mLabel = label; - this.mMonth = month; - } - public WeekItem(WeekItem original) { - this.mWeekInYear = original.getWeekInYear(); - this.mYear = original.getYear(); - this.mMonth = original.getMonth(); - this.mDate = original.getDate(); - this.mLabel = original.getLabel(); - this.mDayItems = original.getDayItems(); - } - - public WeekItem(){ - - } - - // endregion - - // region Getters/Setters - - public int getWeekInYear() { - return mWeekInYear; - } - - public void setWeekInYear(int weekInYear) { - this.mWeekInYear = weekInYear; - } - - public int getYear() { - return mYear; - } - - public void setYear(int year) { - this.mYear = year; - } - - public int getMonth() { - return mMonth; - } - - public void setMonth(int month) { - this.mMonth = month; - } - - public Date getDate() { - return mDate; - } - - public void setDate(Date date) { - this.mDate = date; - } - - public String getLabel() { - return mLabel; - } - - public void setLabel(String label) { - this.mLabel = label; - } - - public List getDayItems() { - return mDayItems; - } - - public void setDayItems(List dayItems) { - this.mDayItems = dayItems; - } - - @Override - public IWeekItem copy() { - return new WeekItem(this); - } - - // endregion - - @Override - public String toString() { - return "WeekItem{" - + "label='" - + mLabel - + '\'' - + ", weekInYear=" - + mWeekInYear - + ", year=" - + mYear - + '}'; - } -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/render/DefaultEventRenderer.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/render/DefaultEventRenderer.java deleted file mode 100644 index 729ad706..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/render/DefaultEventRenderer.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.github.tibolte.agendacalendarview.render; - -import android.content.Context; -import android.content.res.Resources; -import androidx.annotation.NonNull; -import androidx.cardview.widget.CardView; -import androidx.core.content.ContextCompat; - -import android.graphics.Color; -import android.util.TypedValue; -import android.view.View; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.github.tibolte.agendacalendarview.R; -import com.github.tibolte.agendacalendarview.models.BaseCalendarEvent; -import com.google.android.material.internal.ViewUtils; - -/** - * Class helping to inflate our default layout in the AgendaAdapter - */ -public class DefaultEventRenderer extends EventRenderer { - - public static int themeAttributeToColor(int themeAttributeId, - Context context, - int fallbackColorId) { - TypedValue outValue = new TypedValue(); - Resources.Theme theme = context.getTheme(); - boolean wasResolved = - theme.resolveAttribute( - themeAttributeId, outValue, true); - if (wasResolved) { - return ContextCompat.getColor( - context, outValue.resourceId); - } else { - // fallback colour handling - return fallbackColorId; - } - } - - // region class - EventRenderer - - @Override - public void render(@NonNull View view, @NonNull BaseCalendarEvent event) { - CardView card = view.findViewById(R.id.view_agenda_event_card_view); - TextView txtTitle = view.findViewById(R.id.view_agenda_event_title); - TextView txtLocation = view.findViewById(R.id.view_agenda_event_location); - LinearLayout descriptionContainer = view.findViewById(R.id.view_agenda_event_description_container); - LinearLayout locationContainer = view.findViewById(R.id.view_agenda_event_location_container); - - descriptionContainer.setVisibility(View.VISIBLE); - - txtTitle.setText(event.getTitle()); - txtLocation.setText(event.getLocation()); - if (event.getLocation().length() > 0) { - locationContainer.setVisibility(View.VISIBLE); - txtLocation.setText(event.getLocation()); - } else { - locationContainer.setVisibility(View.GONE); - } - - if (!event.isPlaceholder()/*!event.getTitle().equals(view.getResources().getString(R.string.agenda_event_no_events))*/) { - txtTitle.setTextColor(event.getTextColor()); - card.setCardBackgroundColor(event.getColor()); - txtLocation.setTextColor(event.getTextColor()); - } - else { - card.setCardBackgroundColor(Color.TRANSPARENT); - card.setCardElevation(0); - card.setBackgroundColor(Color.TRANSPARENT); - card.setRadius(0); - card.setBackgroundDrawable(null); - } - } - - @Override - public int getEventLayout() { - return R.layout.view_agenda_event; - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/render/EventRenderer.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/render/EventRenderer.java deleted file mode 100644 index e62f23b5..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/render/EventRenderer.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.github.tibolte.agendacalendarview.render; - -import androidx.annotation.LayoutRes; -import android.view.View; - -import com.github.tibolte.agendacalendarview.models.CalendarEvent; - -import java.lang.reflect.ParameterizedType; - -/** - * Base class for helping layout rendering - */ -public abstract class EventRenderer { - public abstract void render(final View view, final T event); - - @LayoutRes - public abstract int getEventLayout(); - - public Class getRenderType() { - ParameterizedType type = (ParameterizedType) getClass().getGenericSuperclass(); - return (Class) type.getActualTypeArguments()[0]; - } -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/BusProvider.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/BusProvider.java deleted file mode 100644 index 99bdbf3d..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/BusProvider.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.github.tibolte.agendacalendarview.utils; - -import rx.Observable; -import rx.subjects.PublishSubject; -import rx.subjects.SerializedSubject; -import rx.subjects.Subject; - -public class BusProvider { - - public static BusProvider mInstance; - - private final Subject mBus = new SerializedSubject<>(PublishSubject.create()); - - // region Constructors - - public static BusProvider getInstance() { - if (mInstance == null) { - mInstance = new BusProvider(); - } - return mInstance; - } - - // endregion - - // region Public methods - - public void send(Object object) { - mBus.onNext(object); - } - - public Observable toObserverable() { - return mBus; - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/DateHelper.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/DateHelper.java deleted file mode 100644 index f9439d04..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/DateHelper.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.github.tibolte.agendacalendarview.utils; - -import com.github.tibolte.agendacalendarview.CalendarManager; -import com.github.tibolte.agendacalendarview.R; -import com.github.tibolte.agendacalendarview.models.IWeekItem; - -import android.content.Context; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Locale; -import java.util.concurrent.TimeUnit; - -/** - * Class containing helper functions for dates - */ -public class DateHelper { - - // region Public methods - - /** - * Check if two Calendar instances have the same time (by month, year and day of month) - * - * @param cal The first Calendar instance. - * @param selectedDate The second Calendar instance. - * @return True if both instances have the same time. - */ - public static boolean sameDate(Calendar cal, Calendar selectedDate) { - return cal.get(Calendar.MONTH) == selectedDate.get(Calendar.MONTH) - && cal.get(Calendar.YEAR) == selectedDate.get(Calendar.YEAR) - && cal.get(Calendar.DAY_OF_MONTH) == selectedDate.get(Calendar.DAY_OF_MONTH); - } - - /** - * Check if a Date instance and a Calendar instance have the same time (by month, year and day - * of month) - * - * @param cal The Calendar instance. - * @param selectedDate The Date instance. - * @return True if both have the same time. - */ - public static boolean sameDate(Calendar cal, Date selectedDate) { - Calendar selectedCal = Calendar.getInstance(); - selectedCal.setTime(selectedDate); - return cal.get(Calendar.MONTH) == selectedCal.get(Calendar.MONTH) - && cal.get(Calendar.YEAR) == selectedCal.get(Calendar.YEAR) - && cal.get(Calendar.DAY_OF_MONTH) == selectedCal.get(Calendar.DAY_OF_MONTH); - } - - /** - * Check if a Date instance is between two Calendar instances' dates (inclusively) in time. - * - * @param selectedDate The date to verify. - * @param startCal The start time. - * @param endCal The end time. - * @return True if the verified date is between the two specified dates. - */ - public static boolean isBetweenInclusive(Date selectedDate, Calendar startCal, Calendar endCal) { - Calendar selectedCal = Calendar.getInstance(); - selectedCal.setTime(selectedDate); - // Check if we deal with the same day regarding startCal and endCal - return sameDate(selectedCal, startCal) || selectedCal.after(startCal) && selectedCal.before(endCal); - } - - /** - * Check if Calendar instance's date is in the same week, as the WeekItem instance. - * - * @param cal The Calendar instance to verify. - * @param week The WeekItem instance to compare to. - * @return True if both instances are in the same week. - */ - public static boolean sameWeek(Calendar cal, IWeekItem week) { - return (cal.get(Calendar.WEEK_OF_YEAR) == week.getWeekInYear() && cal.get(Calendar.YEAR) == week.getYear()); - } - - /** - * Convert a millisecond duration to a string format - * - * @param millis A duration to convert to a string form - * @return A string of the form "Xd" or either "XhXm". - */ - public static String getDuration(Context context, long millis) { - if (millis < 0) { - throw new IllegalArgumentException("Duration must be greater than zero!"); - } - - long days = TimeUnit.MILLISECONDS.toDays(millis); - millis -= TimeUnit.DAYS.toMillis(days); - long hours = TimeUnit.MILLISECONDS.toHours(millis); - millis -= TimeUnit.HOURS.toMillis(hours); - long minutes = TimeUnit.MILLISECONDS.toMinutes(millis); - - StringBuilder sb = new StringBuilder(64); - if (days > 0) { - sb.append(days); - sb.append(context.getResources().getString(R.string.agenda_event_day_duration)); - return (sb.toString()); - } else { - if (hours > 0) { - sb.append(hours); - sb.append("h"); - } - if (minutes > 0) { - sb.append(minutes); - sb.append("m"); - } - } - - return (sb.toString()); - } - - /** - * Used for displaying the date in any section of the agenda view. - * - * @param calendar The date of the section. - * @param locale The locale used by the Sunrise calendar. - * @return The formatted date without the year included. - */ - public static String getYearLessLocalizedDate(Calendar calendar, Locale locale) { - SimpleDateFormat sdf = (SimpleDateFormat) SimpleDateFormat.getDateInstance(DateFormat.FULL, CalendarManager.getInstance().getLocale()); - String pattern = sdf.toPattern(); - - String yearLessPattern = pattern.replaceAll("\\W?[Yy]+\\W?", ""); - SimpleDateFormat yearLessSDF = new SimpleDateFormat(yearLessPattern, locale); - String yearLessDate = yearLessSDF.format(calendar.getTime()).toUpperCase(); - if (yearLessDate.endsWith(",")) { - yearLessDate = yearLessDate.substring(0, yearLessDate.length() - 1); - } - return yearLessDate; - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/Events.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/Events.java deleted file mode 100644 index 98d13f20..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/Events.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.github.tibolte.agendacalendarview.utils; - -import com.github.tibolte.agendacalendarview.models.IDayItem; - -import java.util.Calendar; - -/** - * Events emitted by the bus provider. - */ -public class Events { - - public static class DayClickedEvent { - - public Calendar mCalendar; - public IDayItem mDayItem; - - public DayClickedEvent(IDayItem dayItem) { - this.mCalendar = Calendar.getInstance(); - this.mCalendar.setTime(dayItem.getDate()); - this.mDayItem = dayItem; - } - - public Calendar getCalendar() { - return mCalendar; - } - - public IDayItem getDay() { - return mDayItem; - } - } - - public static class CalendarScrolledEvent { - } - - public static class AgendaListViewTouchedEvent { - } - - public static class EventsFetched { - } - - public static class ForecastFetched { - } -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/ListViewScrollTracker.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/ListViewScrollTracker.java deleted file mode 100644 index 47e16de3..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/utils/ListViewScrollTracker.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.github.tibolte.agendacalendarview.utils; - -import com.github.tibolte.agendacalendarview.agenda.AgendaListView; - -import android.util.SparseArray; -import android.view.View; - -/** - * Helper class calculating the scrolling distance in the AgendaListView. - */ -public class ListViewScrollTracker { - private AgendaListView mListView; - private SparseArray mPositions; - private SparseArray mListViewItemHeights = new SparseArray<>(); - private int mFirstVisiblePosition; - private int mReferencePosition = -1; // Position of the current date in the Agenda listView - - // region Constructor and Accessor(s) - - public ListViewScrollTracker(AgendaListView listView) { - mListView = listView; - } - - public int getReferencePosition() { - return mReferencePosition; - } - - // endregion - - // region Public methods - - /** - * Call from an AbsListView.OnScrollListener to calculate the incremental offset (change in - * scroll offset - * since the last calculation). - * - * @param firstVisiblePosition First visible item position in the list. - * @param visibleItemCount Number of visible items in the list. - * @return The incremental offset, or 0 if it wasn't possible to calculate the offset. - */ - public int calculateIncrementalOffset(int firstVisiblePosition, int visibleItemCount) { - // Remember previous positions, if any - SparseArray previousPositions = mPositions; - - // Store new positions - mPositions = new SparseArray<>(); - for (int i = 0; i < visibleItemCount; i++) { - mPositions.put(firstVisiblePosition + i, mListView.getListChildAt(i).getTop()); - } - - if (previousPositions != null) { - // Find position which exists in both mPositions and previousPositions, then return the difference - // of the new and old Y values. - for (int i = 0; i < previousPositions.size(); i++) { - int previousPosition = previousPositions.keyAt(i); - int previousTop = previousPositions.get(previousPosition); - Integer newTop = mPositions.get(previousPosition); - if (newTop != null) { - return newTop - previousTop; - } - } - } - - return 0; // No view's position was in both previousPositions and mPositions - } - - /** - * Call from an AbsListView.OnScrollListener to calculate the scrollY (Here - * we definite as the distance in pixels compared to the position representing the current - * date). - * - * @param firstVisiblePosition First visible item position in the list. - * @param visibleItemCount Number of visible items in the list. - * @return Distance in pixels compared to current day position (negative if firstVisiblePosition less than mReferencePosition) - */ - public int calculateScrollY(int firstVisiblePosition, int visibleItemCount) { - mFirstVisiblePosition = firstVisiblePosition; - if (mReferencePosition < 0) { - mReferencePosition = mFirstVisiblePosition; - } - - if (visibleItemCount > 0) { - View c = mListView.getListChildAt(0); // this is the first visible row - int scrollY = -c.getTop(); - mListViewItemHeights.put(firstVisiblePosition, c.getMeasuredHeight()); - - if (mFirstVisiblePosition >= mReferencePosition) { - for (int i = mReferencePosition; i < firstVisiblePosition; ++i) { - if (mListViewItemHeights.get(i) == null) { - mListViewItemHeights.put(i, c.getMeasuredHeight()); - } - scrollY += mListViewItemHeights.get(i); // add all heights of the views that are gone - } - return scrollY; - } else { - for (int i = mReferencePosition - 1; i >= firstVisiblePosition; --i) { - if (mListViewItemHeights.get(i) == null) { - mListViewItemHeights.put(i, c.getMeasuredHeight()); - } - scrollY -= mListViewItemHeights.get(i); - } - return scrollY; - } - - } - return 0; - } - - public void clear() { - mPositions = null; - } - - // endregion -} diff --git a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/widgets/FloatingActionButton.java b/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/widgets/FloatingActionButton.java deleted file mode 100644 index bd008910..00000000 --- a/agendacalendarview/src/main/java/com/github/tibolte/agendacalendarview/widgets/FloatingActionButton.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.github.tibolte.agendacalendarview.widgets; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.ViewGroup; -import android.view.ViewTreeObserver; -import android.view.animation.AccelerateDecelerateInterpolator; -import android.view.animation.Interpolator; - -/** - * Floating action button helping to scroll back to the current date. - */ -public class FloatingActionButton extends com.google.android.material.floatingactionbutton.FloatingActionButton { - private static final int TRANSLATE_DURATION_MILLIS = 200; - - private boolean mVisible = true; - - private final Interpolator mInterpolator = new AccelerateDecelerateInterpolator(); - - // region Constructors - - public FloatingActionButton(Context context) { - super(context); - } - - public FloatingActionButton(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public FloatingActionButton(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - // endregion - - // region Overrides - - @Override - public void show() { - show(true); - } - - @Override - public void hide() { - hide(true); - } - - // endregion - - // region Public methods - - public void show(boolean animate) { - toggle(true, animate, false); - } - - public void hide(boolean animate) { - toggle(false, animate, false); - } - - public boolean isVisible() { - return mVisible; - } - - // endregion - - // region Private methods - - private void toggle(final boolean visible, final boolean animate, boolean force) { - if (mVisible != visible || force) { - mVisible = visible; - int height = getHeight(); - if (height == 0 && !force) { - ViewTreeObserver vto = getViewTreeObserver(); - if (vto.isAlive()) { - vto.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() { - @Override - public boolean onPreDraw() { - ViewTreeObserver currentVto = getViewTreeObserver(); - if (currentVto.isAlive()) { - currentVto.removeOnPreDrawListener(this); - } - toggle(visible, animate, true); - return true; - } - }); - return; - } - } - int translationY = visible ? 0 : height + getMarginBottom(); - if (animate) { - animate().setInterpolator(mInterpolator) - .setDuration(TRANSLATE_DURATION_MILLIS) - .translationY(translationY); - } else { - setTranslationY(translationY); - } - } - } - - private int getMarginBottom() { - int marginBottom = 0; - final ViewGroup.LayoutParams layoutParams = getLayoutParams(); - if (layoutParams instanceof ViewGroup.MarginLayoutParams) { - marginBottom = ((ViewGroup.MarginLayoutParams) layoutParams).bottomMargin; - } - return marginBottom; - } - - // endregion -} diff --git a/agendacalendarview/src/main/res/drawable/agenda_day_circle.xml b/agendacalendarview/src/main/res/drawable/agenda_day_circle.xml deleted file mode 100644 index e1398e00..00000000 --- a/agendacalendarview/src/main/res/drawable/agenda_day_circle.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/drawable/fab_arrow.xml b/agendacalendarview/src/main/res/drawable/fab_arrow.xml deleted file mode 100644 index 3b4d3a8c..00000000 --- a/agendacalendarview/src/main/res/drawable/fab_arrow.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/drawable/selected_day_color_circle.xml b/agendacalendarview/src/main/res/drawable/selected_day_color_circle.xml deleted file mode 100644 index 3d53cf8c..00000000 --- a/agendacalendarview/src/main/res/drawable/selected_day_color_circle.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/drawable/shadow.xml b/agendacalendarview/src/main/res/drawable/shadow.xml deleted file mode 100644 index 7ab76207..00000000 --- a/agendacalendarview/src/main/res/drawable/shadow.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/layout/list_item_week.xml b/agendacalendarview/src/main/res/layout/list_item_week.xml deleted file mode 100644 index 846ba637..00000000 --- a/agendacalendarview/src/main/res/layout/list_item_week.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/layout/view_agenda.xml b/agendacalendarview/src/main/res/layout/view_agenda.xml deleted file mode 100644 index 5f4a704e..00000000 --- a/agendacalendarview/src/main/res/layout/view_agenda.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/layout/view_agenda_event.xml b/agendacalendarview/src/main/res/layout/view_agenda_event.xml deleted file mode 100644 index 92329386..00000000 --- a/agendacalendarview/src/main/res/layout/view_agenda_event.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/layout/view_agenda_header.xml b/agendacalendarview/src/main/res/layout/view_agenda_header.xml deleted file mode 100644 index e0391dd5..00000000 --- a/agendacalendarview/src/main/res/layout/view_agenda_header.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/layout/view_agendacalendar.xml b/agendacalendarview/src/main/res/layout/view_agendacalendar.xml deleted file mode 100644 index e2df4255..00000000 --- a/agendacalendarview/src/main/res/layout/view_agendacalendar.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/layout/view_calendar.xml b/agendacalendarview/src/main/res/layout/view_calendar.xml deleted file mode 100644 index 4b3839e0..00000000 --- a/agendacalendarview/src/main/res/layout/view_calendar.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/layout/view_day_calendar_header.xml b/agendacalendarview/src/main/res/layout/view_day_calendar_header.xml deleted file mode 100644 index 2326af49..00000000 --- a/agendacalendarview/src/main/res/layout/view_day_calendar_header.xml +++ /dev/null @@ -1,9 +0,0 @@ - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/layout/view_day_cell.xml b/agendacalendarview/src/main/res/layout/view_day_cell.xml deleted file mode 100644 index cebb97db..00000000 --- a/agendacalendarview/src/main/res/layout/view_day_cell.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/values-en/strings.xml b/agendacalendarview/src/main/res/values-en/strings.xml deleted file mode 100644 index 1d9b1040..00000000 --- a/agendacalendarview/src/main/res/values-en/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - Today - Tomorrow - d - All day - No events - - - LLLL - MMM - diff --git a/agendacalendarview/src/main/res/values/attrs.xml b/agendacalendarview/src/main/res/values/attrs.xml deleted file mode 100644 index 6750df84..00000000 --- a/agendacalendarview/src/main/res/values/attrs.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/agendacalendarview/src/main/res/values/colors.xml b/agendacalendarview/src/main/res/values/colors.xml deleted file mode 100644 index 7904509d..00000000 --- a/agendacalendarview/src/main/res/values/colors.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - #000000 - #9C9CA0 - #CCFFFFFF - #F3F3F3 - - - - #00000000 - - - #2196F3 - #1976D2 - #2196F3 - #BBDEFB - #4caf50 - #FFFFFF - - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/values/dimens.xml b/agendacalendarview/src/main/res/values/dimens.xml deleted file mode 100644 index 7b639f8d..00000000 --- a/agendacalendarview/src/main/res/values/dimens.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - 20dp - 52dp - 14dp - 32dp - - - 60dp - - - - - 70dp - 5dp - 15dp - 5dp - \ No newline at end of file diff --git a/agendacalendarview/src/main/res/values/strings.xml b/agendacalendarview/src/main/res/values/strings.xml deleted file mode 100644 index 7c2c5f8a..00000000 --- a/agendacalendarview/src/main/res/values/strings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - LLLL - E - - - Dziś - Jutro - d - Cały dzień - Brak wydarzeń - - MMM - diff --git a/agendacalendarview/src/main/res/values/styles.xml b/agendacalendarview/src/main/res/values/styles.xml deleted file mode 100644 index b4bf4679..00000000 --- a/agendacalendarview/src/main/res/values/styles.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f7131927..96bb1176 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,20 +1,30 @@ apply plugin: 'com.android.application' -apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' +apply plugin: 'kotlin-parcelize' apply plugin: 'com.google.gms.google-services' -apply plugin: 'io.fabric' +apply plugin: 'com.google.firebase.crashlytics' + +apply from: 'git-info.gradle' android { - signingConfigs { - } - compileSdkVersion rootProject.ext.compileSdkVersion + compileSdkVersion setup.compileSdk + defaultConfig { applicationId 'pl.szczodrzynski.edziennik' minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk + versionCode release.versionCode versionName release.versionName - multiDexEnabled true + + buildConfigField "java.util.Map", "GIT_INFO", gitInfoMap + buildConfigField "String", "VERSION_BASE", "\"${release.versionName}\"" + manifestPlaceholders = [ + buildTimestamp: String.valueOf(System.currentTimeMillis()) + ] + + multiDexEnabled = true externalNativeBuild { cmake { @@ -22,45 +32,48 @@ android { } } } + buildTypes { - applicationVariants.all { variant -> - variant.outputs.all { - if (variant.buildType.name == "release") { - outputFileName = "Edziennik_" + defaultConfig.versionName + ".apk" - } else if (variant.buildType.name == "debugMinify") { - outputFileName = "Edziennik_" + defaultConfig.versionName + "_debugMinify.apk" - } else { - outputFileName = "Edziennik_" + defaultConfig.versionName + "_debug.apk" - } - } - } debug { - minifyEnabled false + minifyEnabled = false + manifestPlaceholders = [ + buildTimestamp: 0 + ] } release { - minifyEnabled true - shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt') + minifyEnabled = true + shrinkResources = true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles fileTree('proguard').asList().toArray() } } - dependencies { - implementation "com.google.firebase:firebase-core:${versions.firebase}" + flavorDimensions "platform" + productFlavors { + main { + versionName gitInfo.versionHuman + } + official {} + play {} } + variantFilter { variant -> + def flavors = variant.flavors*.name + setIgnore(variant.buildType.name == "debug" && !flavors.contains("main")) + } + defaultConfig { vectorDrawables.useSupportLibrary = true } lintOptions { - checkReleaseBuilds false + checkReleaseBuilds = false } - dataBinding { - enabled = true + buildFeatures { + dataBinding = true + viewBinding = true } compileOptions { - sourceCompatibility '1.8' - targetCompatibility '1.8' - } - productFlavors { + coreLibraryDesugaringEnabled = true + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } kotlinOptions { jvmTarget = "1.8" @@ -76,118 +89,116 @@ android { } } -/*task finalizeBundleDebug(type: Copy) { - from("debug/debug") - include "app.aab" - destinationDir file("debug/debug") - rename "app.aab", "Edziennik_debug.aab" -} - -// it finalizes :bundleRelease -task finalizeBundleRelease(type: Copy) { - from("release/release") - include "app.aab" - destinationDir file("release/release") - rename "app.aab", "Edziennik_${android.defaultConfig.versionCode}.aab" -}*/ -/* -// this adds the above two tasks tasks.whenTaskAdded { task -> - if (task.name == "bundleDebug") { - task.finalizedBy finalizeBundleDebug - } else if (task.name == "bundleRelease") { - task.finalizedBy finalizeBundleRelease + if (!task.name.endsWith("Release") && !task.name.endsWith("ReleaseWithR8")) + return + def renameTaskName = "rename${task.name.capitalize()}" + + def flavor = "" + if (task.name.startsWith("bundle")) + flavor = task.name.substring("bundle".length(), task.name.indexOf("Release")).uncapitalize() + if (task.name.startsWith("assemble")) + flavor = task.name.substring("assemble".length(), task.name.indexOf("Release")).uncapitalize() + if (task.name.startsWith("minify")) + flavor = task.name.substring("minify".length(), task.name.indexOf("Release")).uncapitalize() + + if (flavor != "") { + tasks.create(renameTaskName, Copy) { + from file("${projectDir}/${flavor}/release/"), + file("${buildDir}/outputs/mapping/${flavor}Release/"), + file("${buildDir}/outputs/apk/${flavor}/release/"), + file("${buildDir}/outputs/bundle/${flavor}Release/") + include "*.aab", "*.apk", "mapping.txt", "output-metadata.json" + destinationDir file("${projectDir}/release/") + rename ".+?\\.(.+)", "Edziennik_${android.defaultConfig.versionName}_${flavor}." + '$1' + } + task.finalizedBy(renameTaskName) } -}*/ +} dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - annotationProcessor "androidx.room:room-compiler:${versions.room}" - debugImplementation "com.amitshekhar.android:debug-db:1.0.5" + // Language cores + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5" - implementation "android.arch.navigation:navigation-fragment-ktx:${versions.navigationFragment}" - implementation "androidx.appcompat:appcompat:${versions.appcompat}" - implementation "androidx.cardview:cardview:${versions.cardView}" - implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}" - implementation "androidx.core:core-ktx:${versions.ktx}" - implementation "androidx.gridlayout:gridlayout:${versions.gridLayout}" - implementation "androidx.legacy:legacy-support-v4:${versions.legacy}" - implementation "androidx.lifecycle:lifecycle-livedata:${versions.lifecycle}" - implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}" - implementation "androidx.room:room-runtime:${versions.room}" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" + // Android Jetpack + implementation "androidx.appcompat:appcompat:1.3.1" + implementation "androidx.cardview:cardview:1.0.0" + implementation "androidx.constraintlayout:constraintlayout:2.1.0" + implementation "androidx.core:core-ktx:1.6.0" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1" + implementation "androidx.navigation:navigation-fragment-ktx:2.3.5" + implementation "androidx.recyclerview:recyclerview:1.2.1" + implementation "androidx.room:room-runtime:2.3.0" + implementation "androidx.work:work-runtime-ktx:2.6.0" + kapt "androidx.room:room-compiler:2.3.0" - implementation "com.google.android.gms:play-services-wearable:${versions.play_services}" - implementation "com.google.android.material:material:${versions.material}" - implementation "com.google.firebase:firebase-messaging:${versions.firebasemessaging}" + // Google design libs + implementation "com.google.android.material:material:1.4.0" + implementation "com.google.android:flexbox:2.0.1" - //implementation "com.github.kuba2k2.MaterialDrawer:library:e603091449" - implementation "com.mikepenz:crossfader:1.6.0" // do not update - implementation "com.mikepenz:iconics-core:${versions.iconics}" - implementation "com.mikepenz:iconics-views:${versions.iconics}" - implementation "com.mikepenz:community-material-typeface:${versions.font_cmd}@aar" + // Play Services/Firebase + implementation "com.google.android.gms:play-services-wearable:17.1.0" + implementation "com.google.firebase:firebase-core:19.0.1" + implementation "com.google.firebase:firebase-crashlytics:18.2.1" + implementation("com.google.firebase:firebase-messaging") { version { strictly "20.1.3" } } - implementation "com.github.kuba2k2:NavLib:${versions.navlib}" + // OkHttp, Retrofit, Gson, Jsoup + implementation("com.squareup.okhttp3:okhttp") { version { strictly "3.12.13" } } + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + implementation "com.squareup.retrofit2:converter-scalars:2.9.0" + implementation 'com.google.code.gson:gson:2.8.6' + implementation "org.jsoup:jsoup:1.13.1" + implementation "pl.droidsonroids:jspoon:1.3.2" + implementation "pl.droidsonroids.retrofit2:converter-jspoon:1.3.2" - implementation "com.afollestad.material-dialogs:commons:${versions.materialdialogs}" - implementation "com.afollestad.material-dialogs:core:${versions.materialdialogs}" + // Szkolny.eu libraries/forks + implementation "eu.szkolny:android-snowfall:1ca9ea2da3" + implementation "eu.szkolny:agendacalendarview:ac0f3dcf42" + implementation "eu.szkolny:cafebar:5bf0c618de" + implementation "eu.szkolny.fslogin:lib:2.0.0" + implementation "eu.szkolny:material-about-library:1d5ebaf47c" + implementation "eu.szkolny:mhttp:af4b62e6e9" + implementation "eu.szkolny:nachos:0e5dfcaceb" + implementation "eu.szkolny.selective-dao:annotation:27f8f3f194" + implementation "eu.szkolny:ssl-provider:1.0.0" + implementation "pl.szczodrzynski:navlib:0.8.0" + implementation "pl.szczodrzynski:numberslidingpicker:2921225f76" + implementation "pl.szczodrzynski:recyclertablayout:700f980584" + implementation "pl.szczodrzynski:tachyon:551943a6b5" + kapt "eu.szkolny.selective-dao:codegen:27f8f3f194" - implementation "cat.ereza:customactivityoncrash:2.2.0" + // Iconics & related + implementation "com.mikepenz:iconics-core:5.3.1" + implementation "com.mikepenz:iconics-views:5.3.1" + implementation "com.mikepenz:community-material-typeface:5.8.55.0-kotlin@aar" + implementation "eu.szkolny:szkolny-font:77e33acc2a" + + // Other dependencies + implementation "cat.ereza:customactivityoncrash:2.3.0" implementation "com.applandeo:material-calendar-view:1.5.0" - implementation "com.crashlytics.sdk.android:crashlytics:2.10.1" implementation "com.daimajia.swipelayout:library:1.2.0@aar" - implementation "com.evernote:android-job:1.2.6" implementation "com.github.antonKozyriatskyi:CircularProgressIndicator:1.2.2" implementation "com.github.bassaer:chatmessageview:2.0.1" - implementation("com.github.ozodrukh:CircularReveal:2.0.1@aar") {transitive = true} - implementation "com.heinrichreimersoftware:material-intro:1.5.8" // do not update - implementation "com.jaredrummler:colorpicker:1.0.2" - implementation "com.squareup.okhttp3:okhttp:3.12.2" - implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0" // do not update - implementation "com.wdullaer:materialdatetimepicker:4.1.2" + implementation "com.github.CanHub:Android-Image-Cropper:2.2.2" + implementation "com.github.ChuckerTeam.Chucker:library:3.0.1" + implementation "com.github.wulkanowy.uonet-request-signer:hebe-jvm:a99ca50a31" + implementation("com.heinrichreimersoftware:material-intro") { version { strictly "1.5.8" } } + implementation "com.hypertrack:hyperlog:0.0.10" + implementation "com.jaredrummler:colorpicker:1.1.0" + implementation "com.qifan.powerpermission:powerpermission-coroutines:1.3.0" + implementation "com.qifan.powerpermission:powerpermission:1.3.0" implementation "com.yuyh.json:jsonviewer:1.0.6" + implementation "io.coil-kt:coil:1.1.1" implementation "me.dm7.barcodescanner:zxing:1.9.8" implementation "me.grantland:autofittextview:0.2.1" implementation "me.leolin:ShortcutBadger:1.1.22@aar" - implementation "org.greenrobot:eventbus:3.1.1" - implementation "org.jsoup:jsoup:1.10.1" - implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.15" - //implementation "se.emilsjolander:stickylistheaders:2.7.0" - implementation 'com.github.edisonw:StickyListHeaders:master-SNAPSHOT@aar' - implementation "uk.co.samuelwall:material-tap-target-prompt:2.14.0" + implementation "org.greenrobot:eventbus:3.2.0" + implementation("pl.droidsonroids.gif:android-gif-drawable") { version { strictly "1.2.15" } } - implementation project(":agendacalendarview") - implementation project(":cafebar") - implementation project(":material-about-library") - implementation project(":mhttp") - implementation project(":nachos") - //implementation project(":Navigation") - implementation project(":szkolny-font") - - debugImplementation "com.github.ChuckerTeam.Chucker:library:3.0.1" - releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:3.0.1" - - //implementation 'com.github.wulkanowy:uonet-request-signer:master-SNAPSHOT' - //implementation 'com.github.kuba2k2.uonet-request-signer:android:master-63f094b14a-1' - - //implementation "org.redundent:kotlin-xml-builder:1.5.3" - - implementation "io.github.wulkanowy:signer-android:0.1.1" - - implementation "androidx.work:work-runtime-ktx:${versions.work}" - - implementation 'com.hypertrack:hyperlog:0.0.10' - - implementation 'com.github.kuba2k2:RecyclerTabLayout:700f980584' - - implementation 'com.github.kuba2k2:Tachyon:551943a6b5' - - implementation "com.squareup.retrofit2:retrofit:${versions.retrofit}" - implementation "com.squareup.retrofit2:converter-gson:${versions.retrofit}" - - implementation 'com.github.jetradarmobile:android-snowfall:1.2.0' -} -repositories { - mavenCentral() + // Debug-only dependencies + debugImplementation "com.amitshekhar.android:debug-db:1.0.5" } diff --git a/app/git-info.gradle b/app/git-info.gradle new file mode 100644 index 00000000..2ddd8c2d --- /dev/null +++ b/app/git-info.gradle @@ -0,0 +1,125 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-27. + */ + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath "org.eclipse.jgit:org.eclipse.jgit:5.5.+" + } +} + +import org.eclipse.jgit.api.Git +import org.eclipse.jgit.errors.RepositoryNotFoundException +import org.eclipse.jgit.lib.Constants +import org.eclipse.jgit.lib.Ref +import org.eclipse.jgit.lib.Repository +import org.eclipse.jgit.revwalk.RevCommit +import org.eclipse.jgit.revwalk.RevTag +import org.eclipse.jgit.revwalk.RevWalk +import org.eclipse.jgit.storage.file.FileRepositoryBuilder + +private def getGit() { + Repository repo + try { + repo = new FileRepositoryBuilder() + .readEnvironment() + .findGitDir(project.projectDir) + .build() + } catch (IllegalArgumentException | RepositoryNotFoundException ignore) { + def logger = LoggerFactory.getLogger("androidGitVersion") + logger.error("No git repository reachable from ${project.projectDir}") + return results + } + return Git.wrap(repo) +} + +private static def getTags(Repository repo, Git git) { + RevWalk walk = new RevWalk(repo) + def tags = git.tagList().call().findResults { ref -> + def obj = walk.parseAny(ref.getObjectId()) + def name = null + if (obj instanceof RevTag) { + name = obj.getTagName() + } else if (obj instanceof RevCommit) { + name = Repository.shortenRefName(ref.name) + } + [obj.id, name] + } + walk.close() + return tags +} + +private static def getLastTag(Repository repo, Git git, Ref head) { + def tags = getTags(repo, git) + + RevWalk revs = new RevWalk(repo) + revs.markStart(revs.parseCommit(head.getObjectId())) + def revCount = 0 + Collection commitTags = null + for (RevCommit commit : revs) { + def tagsHere = tags.findAll { (it[0] == commit.id) } + if (tagsHere) { + commitTags = tagsHere.stream().map { + [it[0].name, it[1], revCount] + }.toArray() + break + } + revCount++ + } + + return commitTags.last() +} + +private def buildGitInfo() { + Git git = getGit() + Repository repo = git.repository + + def head = repo.findRef(Constants.HEAD).target + + def remotes = git.remoteList().call() + .stream() + .map { + it.name + "(" + it.URIs.stream() + .map { it.rawPath.stripMargin('/').replace(".git", "") } + .toArray() + .join(", ") + ")" + } + .toArray() + .join("; ") + + def status = git.status().call() + def dirty = status.hasUncommittedChanges() + + def tag = getLastTag(repo, git, head) + def tagName = tag[1] + def tagRevCount = tag[2] + def versionName = tagName.replace("v", "") + + def result = [ + hash : head.objectId.name, + branch : repo.branch, + dirty : dirty, + remotes : remotes, + unstaged : status.uncommittedChanges.join("; "), + tag : tagName, + revCount : tagRevCount, + version : """$tagName-$tagRevCount-g${head.objectId.name.substring(0, 8)}""" + (dirty ? ".dirty" : ""), + versionHuman: """$versionName-${repo.branch.replace("/", "_")}""" + (dirty ? ".dirty" : "") + ] + return result +} + +private static def getMapString(map) { + def hashMap = "new java.util.HashMap() { {\n" + map.each { k, v -> hashMap += """\tput("${k}", "${v}");\n""" } + return hashMap + "} }" +} + +ext { + gitInfo = buildGitInfo() + gitInfoMap = getMapString(gitInfo) +} diff --git a/app/libs/java-json.jar b/app/libs/java-json.jar new file mode 100644 index 00000000..2f211e36 Binary files /dev/null and b/app/libs/java-json.jar differ diff --git a/app/proguard/app.pro b/app/proguard-rules.pro similarity index 52% rename from app/proguard/app.pro rename to app/proguard-rules.pro index 0c00ff11..0816fb00 100644 --- a/app/proguard/app.pro +++ b/app/proguard-rules.pro @@ -22,13 +22,21 @@ -keep class android.support.v7.widget.** { *; } -keep class pl.szczodrzynski.edziennik.utils.models.** { *; } --keep class pl.szczodrzynski.edziennik.data.db.modules.events.Event { *; } --keep class pl.szczodrzynski.edziennik.data.db.modules.events.EventFull { *; } +-keep class pl.szczodrzynski.edziennik.data.db.entity.Event { *; } +-keep class pl.szczodrzynski.edziennik.data.db.full.EventFull { *; } +-keep class pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage { *; } -keep class pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel { *; } --keepclassmembers class pl.szczodrzynski.edziennik.widgets.WidgetConfig { public *; } --keepnames class pl.szczodrzynski.edziennik.WidgetTimetable --keepnames class pl.szczodrzynski.edziennik.notifications.WidgetNotifications --keepnames class pl.szczodrzynski.edziennik.luckynumber.WidgetLuckyNumber +-keepclassmembers class pl.szczodrzynski.edziennik.ui.widgets.WidgetConfig { public *; } +-keepnames class pl.szczodrzynski.edziennik.ui.widgets.timetable.WidgetTimetableProvider +-keepnames class pl.szczodrzynski.edziennik.ui.widgets.notifications.WidgetNotificationsProvider +-keepnames class pl.szczodrzynski.edziennik.ui.widgets.luckynumber.WidgetLuckyNumberProvider + +-keepnames class androidx.appcompat.view.menu.MenuBuilder { setHeaderTitleInt(java.lang.CharSequence); } +-keepnames class androidx.appcompat.view.menu.MenuPopupHelper { showPopup(int, int, boolean, boolean); } +-keepclassmembernames class androidx.appcompat.view.menu.StandardMenuPopup { private *; } +-keepclassmembernames class androidx.appcompat.view.menu.MenuItemImpl { private *; } + +-keepclassmembernames class com.mikepenz.materialdrawer.widget.MiniDrawerSliderView { private *; } -keep class .R -keep class **.R$* { @@ -57,5 +65,9 @@ -keep class pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing { public final byte[] pleaseStopRightNow(java.lang.String, long); } --keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; } --keepclassmembernames class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; } \ No newline at end of file +-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.request.** { *; } +-keepclassmembers class pl.szczodrzynski.edziennik.data.api.szkolny.response.** { *; } +-keepclassmembernames class pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo$Platform { *; } + +-keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData { *; } +-keepclassmembernames class pl.szczodrzynski.fslogin.realm.RealmData$Type { *; } diff --git a/app/proguard/android-job.pro b/app/proguard/android-job.pro deleted file mode 100644 index 3f1a67be..00000000 --- a/app/proguard/android-job.pro +++ /dev/null @@ -1,14 +0,0 @@ --dontwarn com.evernote.android.job.gcm.** --dontwarn com.evernote.android.job.GcmAvailableHelper --dontwarn com.evernote.android.job.work.** --dontwarn com.evernote.android.job.WorkManagerAvailableHelper - --keep public class com.evernote.android.job.v21.PlatformJobService --keep public class com.evernote.android.job.v14.PlatformAlarmService --keep public class com.evernote.android.job.v14.PlatformAlarmReceiver --keep public class com.evernote.android.job.JobBootReceiver --keep public class com.evernote.android.job.JobRescheduleService --keep public class com.evernote.android.job.gcm.PlatformGcmService --keep public class com.evernote.android.job.work.PlatformWorker - --keep class com.evernote.android.job.** { *; } \ No newline at end of file diff --git a/app/proguard/blurry.pro b/app/proguard/blurry.pro deleted file mode 100644 index 980f404e..00000000 --- a/app/proguard/blurry.pro +++ /dev/null @@ -1 +0,0 @@ --keep class android.support.v8.renderscript.** { *; } \ No newline at end of file diff --git a/app/proguard/cafebar.pro b/app/proguard/cafebar.pro deleted file mode 100644 index 6f8147fd..00000000 --- a/app/proguard/cafebar.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in D:\AndroidSDK/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - --keep class !android.support.v7.internal.view.menu.**,android.support.** {*;} --keep class android.support.v7.graphics.** { *; } --dontwarn android.support.v7.graphics.** - --keep class android.support.design.widget.** { *; } --keep interface android.support.design.widget.** { *; } --dontwarn android.support.design.** diff --git a/app/proguard/iconics.pro b/app/proguard/iconics.pro deleted file mode 100644 index 0aa62122..00000000 --- a/app/proguard/iconics.pro +++ /dev/null @@ -1,14 +0,0 @@ -# Android iconics library - https://github.com/mikepenz/Android-Iconics -# Warning: works ONLY with iconics > 1.0.0 -# -# Tested on gradle config: -# -# compile 'com.mikepenz:iconics-core:1.7.1@aar' -# - --keep class com.mikepenz.iconics.** { *; } --keep class com.mikepenz.community_material_typeface_library.CommunityMaterial --keep class com.mikepenz.fontawesome_typeface_library.FontAwesome --keep class com.mikepenz.google_material_typeface_library.GoogleMaterial --keep class com.mikepenz.meteocons_typeface_library.Meteoconcs --keep class com.mikepenz.octicons_typeface_library.Octicons \ No newline at end of file diff --git a/app/proguard/mhttp.pro b/app/proguard/mhttp.pro deleted file mode 100644 index 6d3e4e38..00000000 --- a/app/proguard/mhttp.pro +++ /dev/null @@ -1,48 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/wangchao/Work/android-sdk/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} --dontwarn im.wangchao.** --dontwarn okio.** --dontwarn javax.annotation.Nullable --dontwarn javax.annotation.ParametersAreNonnullByDefault --keep class im.wangchao.** { *; } --keep class **_HttpBinder { *; } --keepclasseswithmembernames class * { - @im.wangchao.* ; -} --keepclasseswithmembernames class * { - @im.wangchao.* ; -} --keepclassmembers class * implements java.io.Serializable { - static final long serialVersionUID; - private static final java.io.ObjectStreamField[] serialPersistentFields; - !static !transient ; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} -# okhttp --dontwarn okhttp3.** --dontwarn okio.** --dontwarn javax.annotation.** --dontwarn org.conscrypt.** -# A resource is loaded with a relative path so the package of this class must be preserved. --keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase - -# If you do not use Rx: --dontwarn rx.** \ No newline at end of file diff --git a/app/proguard/szkolny-font.pro b/app/proguard/szkolny-font.pro deleted file mode 100644 index 4e48be73..00000000 --- a/app/proguard/szkolny-font.pro +++ /dev/null @@ -1 +0,0 @@ --keep class com.mikepenz.szkolny_font_typeface_library.SzkolnyFont { *; } diff --git a/app/proguard/wear.pro b/app/proguard/wear.pro deleted file mode 100644 index f1b42451..00000000 --- a/app/proguard/wear.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/app/proguard/zxing.pro b/app/proguard/zxing.pro new file mode 100644 index 00000000..d5eeb97d --- /dev/null +++ b/app/proguard/zxing.pro @@ -0,0 +1,5 @@ +# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} \ No newline at end of file diff --git a/app/sampledata/format-bold/ic_format_bold.xml b/app/sampledata/format-bold/ic_format_bold.xml new file mode 100644 index 00000000..87bc9819 --- /dev/null +++ b/app/sampledata/format-bold/ic_format_bold.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_night.xml b/app/sampledata/format/ic_format_italic.xml similarity index 57% rename from app/src/main/res/drawable/ic_night.xml rename to app/sampledata/format/ic_format_italic.xml index 008a4fbf..b44be3bb 100644 --- a/app/src/main/res/drawable/ic_night.xml +++ b/app/sampledata/format/ic_format_italic.xml @@ -1,3 +1,7 @@ + + + android:pathData="M10,4V7H12.21L8.79,15H6V18H14V15H11.79L15.21,7H18V4H10Z"/> diff --git a/app/sampledata/format/ic_format_underline.xml b/app/sampledata/format/ic_format_underline.xml new file mode 100644 index 00000000..e3d40e63 --- /dev/null +++ b/app/sampledata/format/ic_format_underline.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/sampledata/vulcan/edu.lublin.eu.png b/app/sampledata/vulcan/edu.lublin.eu.png new file mode 100644 index 00000000..ece8b925 Binary files /dev/null and b/app/sampledata/vulcan/edu.lublin.eu.png differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ab159072..cbe7bd48 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,20 @@ xmlns:tools="http://schemas.android.com/tools" package="pl.szczodrzynski.edziennik"> + + + + + + + + + + + + + + - - + + + - - - - - - - - - - - - - + - - - - - - - - - - - - - + + + + + + - - - + + + @@ -174,8 +100,10 @@ android:name="android.appwidget.provider" android:resource="@xml/widget_notifications_info" /> - + + @@ -185,68 +113,98 @@ android:name="android.appwidget.provider" android:resource="@xml/widget_lucky_number_info" /> - + + + + + + + + + + + + - + - - - - - - - - - - - + + - - + + - - - + - - - + + + + - - - - - - - - - - - - diff --git a/app/src/main/assets/certificate.cer b/app/src/main/assets/certificate.cer deleted file mode 100644 index 0002462c..00000000 --- a/app/src/main/assets/certificate.cer +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow -SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT -GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF -q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8 -SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0 -Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA -a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj -/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T -AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG -CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv -bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k -c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw -VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC -ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz -MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu -Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF -AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo -uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/ -wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu -X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG -PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6 -KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg== ------END CERTIFICATE----- diff --git a/app/src/main/assets/pl-changelog.html b/app/src/main/assets/pl-changelog.html index d44c0246..9d71f591 100644 --- a/app/src/main/assets/pl-changelog.html +++ b/app/src/main/assets/pl-changelog.html @@ -1,53 +1,8 @@ - - - - - - - -

    Wersja 4.0, 2019-jeszcze-nie-wiem-kiedy

    +

    Wersja 4.10, 2021-09-22

      -
    • UWAGA. To jest wersja in-development. Wiele funkcji może nie działać prawidłowo (lub wcale), co oznacza tylko że nie zostały jeszcze przeniesione - z wersji 3.x. Proszę o cierpliwość oraz nie udostępnianie tej wersji nikomu.
      • -
    • Bardzo dużo zmian
      • +
    • Dodano wyświetlanie informacji o frekwencji w planie lekcji. @Antoni-Czaplicki
    - - - - \ No newline at end of file +
    +
    +Dzięki za korzystanie ze Szkolnego!
    +© [Kuba Szczodrzyński](@kuba2k2), [Kacper Ziubryniewicz](@kapi2289) 2021 diff --git a/app/src/main/cpp/szkolny-signing.cpp b/app/src/main/cpp/szkolny-signing.cpp index 7d1548c2..d3f11d9d 100644 --- a/app/src/main/cpp/szkolny-signing.cpp +++ b/app/src/main/cpp/szkolny-signing.cpp @@ -9,7 +9,7 @@ /*secret password - removed for source code publication*/ static toys AES_IV[16] = { - 0x43, 0xb9, 0xaa, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + 0xda, 0x2a, 0x5f, 0xbe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; unsigned char *agony(unsigned int laugh, unsigned char *box, unsigned char *heat); diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.java b/app/src/main/java/pl/szczodrzynski/edziennik/App.java deleted file mode 100644 index ebc7bf2f..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/App.java +++ /dev/null @@ -1,723 +0,0 @@ -package pl.szczodrzynski.edziennik; - -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.content.pm.ShortcutInfo; -import android.content.pm.ShortcutManager; -import android.content.pm.Signature; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.drawable.Icon; -import android.os.AsyncTask; -import android.os.Build; -import android.os.Handler; -import android.provider.Settings; -import android.util.Base64; -import android.util.Log; - -import androidx.annotation.RequiresApi; -import androidx.appcompat.app.AppCompatDelegate; -import androidx.work.Configuration; - -import com.chuckerteam.chucker.api.ChuckerCollector; -import com.chuckerteam.chucker.api.ChuckerInterceptor; -import com.chuckerteam.chucker.api.RetentionManager; -import com.google.android.gms.security.ProviderInstaller; -import com.google.firebase.FirebaseApp; -import com.google.firebase.FirebaseOptions; -import com.google.firebase.iid.FirebaseInstanceId; -import com.google.firebase.messaging.FirebaseMessaging; -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonSyntaxException; -import com.hypertrack.hyperlog.HyperLog; -import com.mikepenz.iconics.Iconics; -import com.mikepenz.iconics.IconicsColor; -import com.mikepenz.iconics.IconicsDrawable; -import com.mikepenz.iconics.IconicsSize; -import com.mikepenz.iconics.typeface.IIcon; -import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont; - -import java.lang.reflect.Field; -import java.security.KeyStore; -import java.security.MessageDigest; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.ConcurrentModificationException; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import javax.net.ssl.X509TrustManager; - -import cat.ereza.customactivityoncrash.config.CaocConfig; -import im.wangchao.mhttp.MHttp; -import im.wangchao.mhttp.internal.cookie.PersistentCookieJar; -import im.wangchao.mhttp.internal.cookie.cache.SetCookieCache; -import im.wangchao.mhttp.internal.cookie.persistence.SharedPrefsCookiePersistor; -import me.leolin.shortcutbadger.ShortcutBadger; -import okhttp3.ConnectionSpec; -import okhttp3.OkHttpClient; -import okhttp3.TlsVersion; -import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing; -import pl.szczodrzynski.edziennik.config.Config; -import pl.szczodrzynski.edziennik.data.db.AppDb; -import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLog; -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile; -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull; -import pl.szczodrzynski.edziennik.network.NetworkUtils; -import pl.szczodrzynski.edziennik.network.TLSSocketFactory; -import pl.szczodrzynski.edziennik.sync.SyncWorker; -import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity; -import pl.szczodrzynski.edziennik.utils.DebugLogFormat; -import pl.szczodrzynski.edziennik.utils.PermissionChecker; -import pl.szczodrzynski.edziennik.utils.Themes; -import pl.szczodrzynski.edziennik.utils.Utils; -import pl.szczodrzynski.edziennik.utils.models.AppConfig; - -import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK; - -public class App extends androidx.multidex.MultiDexApplication implements Configuration.Provider { - private static final String TAG = "App"; - public static int profileId = -1; - private Context mContext; - - @Override - public Configuration getWorkManagerConfiguration() { - return new Configuration.Builder() - .setMinimumLoggingLevel(Log.VERBOSE) - .build(); - } - - - public static final int REQUEST_TIMEOUT = 10 * 1000; - - // notifications - //public NotificationManager mNotificationManager; - //public final String NOTIFICATION_CHANNEL_ID_UPDATES = "4566"; - //public String NOTIFICATION_CHANNEL_NAME_UPDATES; - public Notifier notifier; - - public static final String APP_URL = "://edziennik.szczodrzynski.pl/app/"; - - public ShortcutManager shortcutManager; - - public PermissionChecker permissionChecker; - - public String signature = ""; - public String deviceId = ""; - - public AppDb db; - public void debugLog(String text) { - if (!devMode) - return; - db.debugLogDao().add(new DebugLog(Utils.getCurrentTimeUsingCalendar()+": "+text)); - } - public void debugLogAsync(String text) { - if (!devMode) - return; - AsyncTask.execute(() -> { - db.debugLogDao().add(new DebugLog(Utils.getCurrentTimeUsingCalendar()+": "+text)); - }); - } - - // network & APIs - public NetworkUtils networkUtils; - public PersistentCookieJar cookieJar; - public OkHttpClient http; - public OkHttpClient httpLazy; - - public SharedPreferences appSharedPrefs; // sharedPreferences for APPCONFIG + JOBS STORE - public AppConfig appConfig; // APPCONFIG: common for all profiles - //public AppProfile profile; // current profile - public JsonObject loginStore = null; - public SharedPreferences registerStore; // sharedPreferences for REGISTER - //public Register register; // REGISTER for current profile, read from registerStore - - public ProfileFull profile; - public Config config; - private static Config mConfig; - public static Config getConfig() { - return mConfig; - } - - // other stuff - public Gson gson; - public String requestScheme = "https"; - public boolean unreadBadgesAvailable = true; - - public static boolean devMode = false; - - public static final boolean UPDATES_ON_PLAY_STORE = true; - - @RequiresApi(api = Build.VERSION_CODES.M) - public Icon getDesktopIconFromIconics(IIcon icon) { - final IconicsDrawable drawable = new IconicsDrawable(mContext, icon) - .color(IconicsColor.colorInt(Color.WHITE)) - .size(IconicsSize.dp(48)) - .padding(IconicsSize.dp(8)) - .backgroundColor(IconicsColor.colorRes(R.color.colorPrimaryDark)) - .roundedCorners(IconicsSize.dp(10)); - //drawable.setStyle(Paint.Style.FILL); - final Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888); - final Canvas canvas = new Canvas(bitmap); - drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); - drawable.draw(canvas); - - return Icon.createWithBitmap(bitmap); - } - - @Override - public void onCreate() { - super.onCreate(); - AppCompatDelegate.setCompatVectorFromResourcesEnabled(true); - CaocConfig.Builder.create() - .backgroundMode(CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM) //default: CaocConfig.BACKGROUND_MODE_SHOW_CUSTOM - .enabled(true) //default: true - .showErrorDetails(true) //default: true - .showRestartButton(true) //default: true - .logErrorOnRestart(true) //default: true - .trackActivities(true) //default: false - .minTimeBetweenCrashesMs(2000) //default: 3000 - .errorDrawable(R.drawable.ic_rip) //default: bug image - .restartActivity(MainActivity.class) //default: null (your app's launch activity) - .errorActivity(CrashActivity.class) //default: null (default error activity) - //.eventListener(new YourCustomEventListener()) //default: null - .apply(); - mContext = this; - db = AppDb.getDatabase(this); - gson = new Gson(); - networkUtils = new NetworkUtils(this); - - config = new Config(db); - config.migrate(this); - mConfig = config; - - Iconics.init(getApplicationContext()); - Iconics.registerFont(SzkolnyFont.INSTANCE); - - notifier = new Notifier(this); - permissionChecker = new PermissionChecker(mContext); - - deviceId = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID); - - cookieJar = new PersistentCookieJar(new SetCookieCache(), new SharedPrefsCookiePersistor(this)); - - appSharedPrefs = getSharedPreferences(getString(R.string.preference_file_global), Context.MODE_PRIVATE); - - loadConfig(); - - Signing.INSTANCE.getCert(this); - - Themes.INSTANCE.setThemeInt(config.getUi().getTheme()); - - try { - PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), PackageManager.GET_SIGNATURES); - for (Signature signature: packageInfo.signatures) { - byte[] signatureBytes = signature.toByteArray(); - MessageDigest md = MessageDigest.getInstance("SHA"); - md.update(signatureBytes); - this.signature = Base64.encodeToString(md.digest(), Base64.NO_WRAP); - //Log.d(TAG, "Signature is "+this.signature); - } - } - catch (Exception e) { - e.printStackTrace(); - } - - if ("f054761fbdb6a238".equals(deviceId) || BuildConfig.DEBUG) { - devMode = true; - } - else if (config.getDevModePassword() != null) { - checkDevModePassword(); - } - - OkHttpClient.Builder httpBuilder = new OkHttpClient.Builder() - .cache(null) - .followRedirects(true) - .followSslRedirects(true) - .retryOnConnectionFailure(true) - .cookieJar(cookieJar) - .connectTimeout(30, TimeUnit.SECONDS) - .writeTimeout(20, TimeUnit.SECONDS) - .readTimeout(40, TimeUnit.SECONDS); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { - try { - try { - ProviderInstaller.installIfNeeded(this); - } catch (Exception e) { - Log.e("OkHttpTLSCompat", "Play Services not found or outdated"); - X509TrustManager x509TrustManager = null; - TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); - trustManagerFactory.init((KeyStore) null); - for (TrustManager trustManager: trustManagerFactory.getTrustManagers()) { - if (trustManager instanceof X509TrustManager) - x509TrustManager = (X509TrustManager) trustManager; - } - - SSLContext sc = SSLContext.getInstance("TLSv1.2"); - sc.init(null, null, null); - httpBuilder.sslSocketFactory(new TLSSocketFactory(sc.getSocketFactory()), x509TrustManager); - - ConnectionSpec cs = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS) - .tlsVersions(TlsVersion.TLS_1_0) - .tlsVersions(TlsVersion.TLS_1_1) - .tlsVersions(TlsVersion.TLS_1_2) - .build(); - - List specs = new ArrayList<>(); - specs.add(cs); - specs.add(ConnectionSpec.COMPATIBLE_TLS); - specs.add(ConnectionSpec.CLEARTEXT); - - httpBuilder.connectionSpecs(specs); - } - - - } catch (Exception exc) { - Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc); - } - } - - if (App.devMode || BuildConfig.DEBUG) { - HyperLog.initialize(this); - HyperLog.setLogLevel(Log.VERBOSE); - HyperLog.setLogFormat(new DebugLogFormat(this)); - - ChuckerCollector chuckerCollector = new ChuckerCollector(this, true, RetentionManager.Period.ONE_HOUR); - ChuckerInterceptor chuckerInterceptor = new ChuckerInterceptor(this, chuckerCollector); - httpBuilder.addInterceptor(chuckerInterceptor); - } - - http = httpBuilder.build(); - httpLazy = http.newBuilder().followRedirects(false).followSslRedirects(false).build(); - - MHttp.instance() - .customOkHttpClient(http); - - //register = new Register(mContext); - - //profileLoadById(appSharedPrefs.getInt("current_profile_id", 1)); - - if (config.getSync().getEnabled()) { - SyncWorker.Companion.scheduleNext(this, false); - } - else { - SyncWorker.Companion.cancelNext(this); - } - - db.metadataDao().countUnseen().observeForever(count -> { - Log.d("MainActivity", "Overall unseen count changed"); - assert count != null; - if (unreadBadgesAvailable) { - unreadBadgesAvailable = ShortcutBadger.applyCount(this, count); - } - }); - - //new IonCookieManager(mContext); - - new Handler().post(() -> { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { - shortcutManager = getSystemService(ShortcutManager.class); - - ShortcutInfo shortcutTimetable = new ShortcutInfo.Builder(mContext, "item_timetable") - .setShortLabel(getString(R.string.shortcut_timetable)).setLongLabel(getString(R.string.shortcut_timetable)) - .setIcon(Icon.createWithResource(this, R.mipmap.ic_shortcut_timetable)) - //.setIcon(getDesktopIconFromIconics(CommunityMaterial.Icon2.cmd_timetable)) - .setIntent(new Intent(Intent.ACTION_MAIN, null, this, MainActivity.class) - .putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE)) - .build(); - - ShortcutInfo shortcutAgenda = new ShortcutInfo.Builder(mContext, "item_agenda") - .setShortLabel(getString(R.string.shortcut_agenda)).setLongLabel(getString(R.string.shortcut_agenda)) - .setIcon(Icon.createWithResource(this, R.mipmap.ic_shortcut_agenda)) - //.setIcon(getDesktopIconFromIconics(CommunityMaterial.Icon.cmd_calendar)) - .setIntent(new Intent(Intent.ACTION_MAIN, null, this, MainActivity.class) - .putExtra("fragmentId", MainActivity.DRAWER_ITEM_AGENDA)) - .build(); - - ShortcutInfo shortcutGrades = new ShortcutInfo.Builder(mContext, "item_grades") - .setShortLabel(getString(R.string.shortcut_grades)).setLongLabel(getString(R.string.shortcut_grades)) - .setIcon(Icon.createWithResource(this, R.mipmap.ic_shortcut_grades)) - //.setIcon(getDesktopIconFromIconics(CommunityMaterial.Icon2.cmd_numeric_5_box)) - .setIntent(new Intent(Intent.ACTION_MAIN, null, this, MainActivity.class) - .putExtra("fragmentId", MainActivity.DRAWER_ITEM_GRADES)) - .build(); - - ShortcutInfo shortcutHomework = new ShortcutInfo.Builder(mContext, "item_homeworks") - .setShortLabel(getString(R.string.shortcut_homework)).setLongLabel(getString(R.string.shortcut_homework)) - .setIcon(Icon.createWithResource(this, R.mipmap.ic_shortcut_homework)) - //.setIcon(getDesktopIconFromIconics(SzkolnyFont.Icon.szf_file_document_edit)) - .setIntent(new Intent(Intent.ACTION_MAIN, null, this, MainActivity.class) - .putExtra("fragmentId", MainActivity.DRAWER_ITEM_HOMEWORK)) - .build(); - - ShortcutInfo shortcutMessages = new ShortcutInfo.Builder(mContext, "item_messages") - .setShortLabel(getString(R.string.shortcut_messages)).setLongLabel(getString(R.string.shortcut_messages)) - .setIcon(Icon.createWithResource(this, R.mipmap.ic_shortcut_messages)) - //.setIcon(getDesktopIconFromIconics(CommunityMaterial.Icon.cmd_email)) - .setIntent(new Intent(Intent.ACTION_MAIN, null, this, MainActivity.class) - .putExtra("fragmentId", MainActivity.DRAWER_ITEM_MESSAGES )) - .build(); - - shortcutManager.setDynamicShortcuts(Arrays.asList(shortcutTimetable, shortcutAgenda, shortcutGrades, shortcutHomework, shortcutMessages)); - } - - if (config.getAppInstalledTime() == 0) { - try { - config.setAppInstalledTime(getPackageManager().getPackageInfo(getPackageName(), 0).firstInstallTime); - config.setAppRateSnackbarTime(config.getAppInstalledTime() + 7 * 24 * 60 * 60 * 1000); - } catch (PackageManager.NameNotFoundException e) { - e.printStackTrace(); - } - } - - /*Task capabilityInfoTask = - Wearable.getCapabilityClient(this) - .getCapability("edziennik_wear_app", CapabilityClient.FILTER_REACHABLE); - capabilityInfoTask.addOnCompleteListener((task) -> { - if (task.isSuccessful()) { - CapabilityInfo capabilityInfo = task.getResult(); - assert capabilityInfo != null; - Set nodes; - nodes = capabilityInfo.getNodes(); - Log.d(TAG, "Nodes "+nodes); - - if (nodes.size() > 0) { - Wearable.getMessageClient(this).sendMessage( - nodes.toArray(new Node[]{})[0].getId(), "/ping", "Hello world".getBytes()); - } - } else { - Log.d(TAG, "Capability request failed to return any results."); - } - }); - - Wearable.getDataClient(this).addListener(dataEventBuffer -> { - Log.d(TAG, "onDataChanged(): " + dataEventBuffer); - - for (DataEvent event : dataEventBuffer) { - if (event.getType() == DataEvent.TYPE_CHANGED) { - String path = event.getDataItem().getUri().getPath(); - Log.d(TAG, "Data "+path+ " :: "+Arrays.toString(event.getDataItem().getData())); - } - } - });*/ - - FirebaseApp pushMobidziennikApp = FirebaseApp.initializeApp( - this, - new FirebaseOptions.Builder() - .setApiKey("AIzaSyCi5LmsZ5BBCQnGtrdvWnp1bWLCNP8OWQE") - .setApplicationId("1:747285019373:android:f6341bf7b158621d") - .build(), - "Mobidziennik2" - ); - - FirebaseApp pushLibrusApp = FirebaseApp.initializeApp( - this, - new FirebaseOptions.Builder() - .setApiKey("AIzaSyDfTuEoYPKdv4aceEws1CO3n0-HvTndz-o") - .setApplicationId("1:513056078587:android:1e29083b760af544") - .build(), - "Librus" - ); - - FirebaseApp pushVulcanApp = FirebaseApp.initializeApp( - this, - new FirebaseOptions.Builder() - .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA") - .setApplicationId("1:987828170337:android:ac97431a0a4578c3") - .build(), - "Vulcan" - ); - - try { - final long startTime = System.currentTimeMillis(); - FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(instanceIdResult -> { - Log.d(TAG, "Token for App is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId()+". Time is "+(System.currentTimeMillis() - startTime)); - config.getSync().setTokenApp(instanceIdResult.getToken()); - }); - /*FirebaseInstanceId.getInstance(pushMobidziennikApp).getInstanceId().addOnSuccessListener(instanceIdResult -> { - Log.d(TAG, "Token for Mobidziennik is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId()); - appConfig.fcmTokens.put(LOGIN_TYPE_MOBIDZIENNIK, new Pair<>(instanceIdResult.getToken(), new ArrayList<>())); - }); - FirebaseInstanceId.getInstance(pushLibrusApp).getInstanceId().addOnSuccessListener(instanceIdResult -> { - Log.d(TAG, "Token for Librus is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId()); - appConfig.fcmTokens.put(LOGIN_TYPE_LIBRUS, new Pair<>(instanceIdResult.getToken(), new ArrayList<>())); - }); - FirebaseInstanceId.getInstance(pushVulcanApp).getInstanceId().addOnSuccessListener(instanceIdResult -> { - Log.d(TAG, "Token for Vulcan is " + instanceIdResult.getToken() + ", ID is " + instanceIdResult.getId()); - Pair> pair = appConfig.fcmTokens.get(LOGIN_TYPE_VULCAN); - if (pair == null || pair.first == null || !pair.first.equals(instanceIdResult.getToken())) { - appConfig.fcmTokens.put(LOGIN_TYPE_VULCAN, new Pair<>(instanceIdResult.getToken(), new ArrayList<>())); - } - });*/ - - - FirebaseMessaging.getInstance().subscribeToTopic(getPackageName()); - } - catch (IllegalStateException e) { - e.printStackTrace(); - } - }); - - } - - - public void loadConfig() - { - appConfig = new AppConfig(this); - - - if (appSharedPrefs.contains("config")) { - // remove old-format config, save the new one and empty the incorrectly-nulled config - appConfig = gson.fromJson(appSharedPrefs.getString("config", ""), AppConfig.class); - appSharedPrefs.edit().remove("config").apply(); - saveConfig(); - appConfig = new AppConfig(this); - } - - if (appSharedPrefs.contains("profiles")) { - SharedPreferences.Editor appSharedPrefsEditor = appSharedPrefs.edit(); - /*List appProfileIds = gson.fromJson(appSharedPrefs.getString("profiles", ""), new TypeToken>(){}.getType()); - for (int id: appProfileIds) { - AppProfile appProfile = gson.fromJson(appSharedPrefs.getString("profile"+id, ""), AppProfile.class); - if (appProfile != null) { - appConfig.profiles.add(appProfile); - } - appSharedPrefsEditor.remove("profile"+id); - }*/ - appSharedPrefsEditor.remove("profiles"); - appSharedPrefsEditor.apply(); - //profilesSave(); - } - - - Map keys = appSharedPrefs.getAll(); - for (Map.Entry entry : keys.entrySet()) { - if (entry.getKey().startsWith("app.appConfig.")) { - String fieldName = entry.getKey().replace("app.appConfig.", ""); - - try { - Field field = AppConfig.class.getField(fieldName); - Object object; - try { - object = gson.fromJson(entry.getValue().toString(), field.getGenericType()); - } catch (JsonSyntaxException e) { - Log.d(TAG, "For field "+fieldName); - e.printStackTrace(); - object = entry.getValue().toString(); - } - if (object != null) - field.set(appConfig, object); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - Log.w(TAG, "Should remove app.appConfig."+fieldName); - //appSharedPrefs.edit().remove("app.appConfig."+fieldName).apply(); TODO migration - } - } - } - - /*if (appConfig.lastAppVersion > BuildConfig.VERSION_CODE) { - BootReceiver br = new BootReceiver(); - Intent i = new Intent(); - //i.putExtra("UserChecked", true); - br.onReceive(getContext(), i); - Toast.makeText(mContext, R.string.warning_older_version_running, Toast.LENGTH_LONG).show(); - //Toast.makeText(mContext, "Zaktualizuj aplikację.", Toast.LENGTH_LONG).show(); - //System.exit(0); - }*/ - - if (appConfig == null) { - appConfig = new AppConfig(this); - } - } - public void saveConfig() - { - try { - appConfig.savePending = false; - - SharedPreferences.Editor appSharedPrefsEditor = appSharedPrefs.edit(); - - JsonObject appConfigJson = gson.toJsonTree(appConfig).getAsJsonObject(); - for (Map.Entry entry : appConfigJson.entrySet()) { - String jsonObj; - jsonObj = entry.getValue().toString(); - /*if (entry.getValue().isJsonObject()) { - jsonObj = entry.getValue().getAsJsonObject().toString(); - } - else if (entry.getValue().isJsonArray()) { - jsonObj = entry.getValue().getAsJsonArray().toString(); - } - else { - jsonObj = entry.getValue().toString(); - }*/ - appSharedPrefsEditor.putString("app.appConfig." + entry.getKey(), jsonObj); - } - - appSharedPrefsEditor.apply(); - } - catch (ConcurrentModificationException e) { - e.printStackTrace(); - } - //appSharedPrefs.edit().putString("config", gson.toJson(appConfig)).apply(); - } - public void saveConfig(String ... fieldNames) - { - appConfig.savePending = false; - - SharedPreferences.Editor appSharedPrefsEditor = appSharedPrefs.edit(); - - for (String fieldName: fieldNames) { - try { - Object object = AppConfig.class.getField(fieldName).get(appConfig); - appSharedPrefsEditor.putString("app.appConfig."+fieldName, gson.toJson(object)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } catch (ConcurrentModificationException e) { - e.printStackTrace(); - } - } - - appSharedPrefsEditor.apply(); - //appSharedPrefs.edit().putString("config", gson.toJson(appConfig)).apply(); - } - - public void profileSave() { - AsyncTask.execute(() -> { - db.profileDao().add(profile); - }); - } - - public void profileSaveAsync() { - AsyncTask.execute(() -> { - db.profileDao().add(profile); - }); - } - public void profileSaveAsync(Profile profile) { - AsyncTask.execute(() -> { - db.profileDao().add(profile); - }); - } - public void profileSaveFullAsync(ProfileFull profile) { - AsyncTask.execute(() -> { - profileSaveFull(profile); - }); - } - public void profileSaveFull(ProfileFull profileFull) { - db.profileDao().add(profileFull); - db.loginStoreDao().add(profileFull); - } - - public void profileLoadById(int id) { - profileLoadById(id, false); - } - public void profileLoadById(int id, boolean loadedLast) { - //Log.d(TAG, "Loading ID "+id); - /*if (profile == null) { - profile = profileNew(); - AppDb.profileId = profile.id; - appSharedPrefs.edit().putInt("current_profile_id", profile.id).apply(); - return; - }*/ - if (profile == null || profile.getId() != id) { - profile = db.profileDao().getFullByIdNow(id); - /*if (profile == null) { - profileLoadById(id); - return; - }*/ - if (profile != null) { - MainActivity.Companion.setUseOldMessages(profile.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK && appConfig.mobidziennikOldMessages == 1); - profileId = profile.getId(); - appSharedPrefs.edit().putInt("current_profile_id", profile.getId()).apply(); - config.setProfile(profileId); - } - else if (!loadedLast) { - profileLoadById(profileLastId(), true); - } - else { - profileId = -1; - } - } - } - - public void profileLoad(ProfileFull profile) { - MainActivity.Companion.setUseOldMessages(profile.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK && appConfig.mobidziennikOldMessages == 1); - this.profile = profile; - profileId = profile.getId(); - } - - /*public void profileRemove(int id) - { - Profile profile = db.profileDao().getFullByIdNow(id); - - if (profile.id == profile.loginStoreId) { - // this profile is the owner of the login store - // we need to check if any other profile is using it - List transferProfileIds = db.profileDao().getIdsByLoginStoreIdNow(profile.loginStoreId); - if (transferProfileIds.size() == 1) { - // this login store is free of users, remove it along with the profile - db.loginStoreDao().remove(profile.loginStoreId); - // the current store is removed, we are ready to remove the profile - } - else if (transferProfileIds.size() > 1) { - transferProfileIds.remove(transferProfileIds.indexOf(profile.id)); - // someone is using the store - // we need to transfer it to the firstProfileId - db.loginStoreDao().changeId(profile.loginStoreId, transferProfileIds.get(0)); - db.profileDao().changeStoreId(profile.loginStoreId, transferProfileIds.get(0)); - // the current store is removed, we are ready to remove the profile - } - } - // else, the profile uses a store that it doesn't own - // leave the store and go on with removing - - Log.d(TAG, "Before removal: "+db.profileDao().getAllNow().toString()); - db.profileDao().remove(profile.id); - Log.d(TAG, "After removal: "+db.profileDao().getAllNow().toString()); - - *//*int newId = 1; - if (appConfig.profiles.size() > 0) { - newId = appConfig.profiles.get(appConfig.profiles.size() - 1).id; - } - Log.d(TAG, "New ID: "+newId); - //Toast.makeText(mContext, "selected new id "+newId, Toast.LENGTH_SHORT).show(); - profileLoadById(newId);*//* - }*/ - - public int profileFirstId() { - return db.profileDao().getFirstId(); - } - - public int profileLastId() { - return db.profileDao().getLastId(); - } - - - public Context getContext() - { - return mContext; - } - - public void checkDevModePassword() { - try { - devMode = Utils.AESCrypt.decrypt("nWFVxY65Pa8/aRrT7EylNAencmOD+IxUY2Gg/beiIWY=", config.getDevModePassword()).equals("ok here you go it's enabled now") - || BuildConfig.DEBUG; - } catch (Exception e) { - e.printStackTrace(); - devMode = false; - } - } - -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt index f31deb09..b3ec1cc3 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt @@ -4,20 +4,83 @@ package pl.szczodrzynski.edziennik +import android.content.Intent +import android.content.pm.PackageManager +import android.content.pm.ShortcutInfo +import android.content.pm.ShortcutManager +import android.graphics.drawable.Icon +import android.os.Build +import android.provider.Settings import android.util.Log +import androidx.appcompat.app.AppCompatDelegate +import androidx.multidex.MultiDexApplication import androidx.work.Configuration -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job +import cat.ereza.customactivityoncrash.config.CaocConfig +import com.chuckerteam.chucker.api.ChuckerCollector +import com.chuckerteam.chucker.api.ChuckerInterceptor +import com.chuckerteam.chucker.api.RetentionManager +import com.google.firebase.FirebaseApp +import com.google.firebase.FirebaseOptions +import com.google.firebase.iid.FirebaseInstanceId +import com.google.firebase.messaging.FirebaseMessaging +import com.google.gson.Gson +import com.hypertrack.hyperlog.HyperLog +import com.mikepenz.iconics.Iconics +import eu.szkolny.sslprovider.SSLProvider +import eu.szkolny.sslprovider.enableSupportedTls +import im.wangchao.mhttp.MHttp +import kotlinx.coroutines.* +import me.leolin.shortcutbadger.ShortcutBadger +import okhttp3.OkHttpClient +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.config.Config +import pl.szczodrzynski.edziennik.data.api.events.ProfileListEmptyEvent +import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing +import pl.szczodrzynski.edziennik.data.db.AppDb +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.network.cookie.DumbCookieJar +import pl.szczodrzynski.edziennik.sync.SyncWorker +import pl.szczodrzynski.edziennik.sync.UpdateWorker +import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity +import pl.szczodrzynski.edziennik.utils.* +import pl.szczodrzynski.edziennik.utils.Utils.d +import pl.szczodrzynski.edziennik.utils.managers.* +import timber.log.Timber +import java.util.concurrent.TimeUnit import kotlin.coroutines.CoroutineContext -class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScope { +class App : MultiDexApplication(), Configuration.Provider, CoroutineScope { companion object { + @Volatile + lateinit var db: AppDb + lateinit var config: Config + lateinit var profile: Profile + val profileId + get() = profile.id + + var enableChucker = false + var debugMode = false var devMode = false } - //lateinit var db: AppDb - //val config by lazy { Config(db); // TODO migrate } + val notificationChannelsManager by lazy { NotificationChannelsManager(this) } + val userActionManager by lazy { UserActionManager(this) } + val gradesManager by lazy { GradesManager(this) } + val timetableManager by lazy { TimetableManager(this) } + val eventManager by lazy { EventManager(this) } + val permissionManager by lazy { PermissionManager(this) } + val attendanceManager by lazy { AttendanceManager(this) } + val buildManager by lazy { BuildManager(this) } + val availabilityManager by lazy { AvailabilityManager(this) } + + val db + get() = App.db + val config + get() = App.config + val profile + get() = App.profile + val profileId + get() = App.profileId private val job = Job() override val coroutineContext: CoroutineContext @@ -26,11 +89,8 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop .setMinimumLoggingLevel(Log.VERBOSE) .build() - /*val preferences by lazy { getSharedPreferences(getString(R.string.preference_file), Context.MODE_PRIVATE) } - val notifier by lazy { Notifier(this) } val permissionChecker by lazy { PermissionChecker(this) } - - lateinit var profile: ProfileFull + val gson by lazy { Gson() } /* _ _ _______ _______ _____ | | | |__ __|__ __| __ \ @@ -38,36 +98,42 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop | __ | | | | | | ___/ | | | | | | | | | | |_| |_| |_| |_| |*/ - val http: OkHttpClient by lazy { - val builder = OkHttpClient.Builder() - .cache(null) - .followRedirects(true) - .followSslRedirects(true) - .retryOnConnectionFailure(true) - .cookieJar(cookieJar) - .connectTimeout(20, TimeUnit.SECONDS) - .writeTimeout(5, TimeUnit.SECONDS) - .readTimeout(10, TimeUnit.SECONDS) - builder.installHttpsSupport() + lateinit var http: OkHttpClient + lateinit var httpLazy: OkHttpClient - if (devMode || BuildConfig.DEBUG) { + private fun buildHttp() { + val builder = OkHttpClient.Builder() + .cache(null) + .followRedirects(true) + .followSslRedirects(true) + .retryOnConnectionFailure(true) + .cookieJar(cookieJar) + .connectTimeout(15, TimeUnit.SECONDS) + .writeTimeout(10, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .enableSupportedTls(enableCleartext = true) + + if (devMode) { HyperLog.initialize(this) HyperLog.setLogLevel(Log.VERBOSE) HyperLog.setLogFormat(DebugLogFormat(this)) - val chuckerCollector = ChuckerCollector(this, true, Period.ONE_HOUR) - val chuckerInterceptor = ChuckerInterceptor(this, chuckerCollector) - builder.addInterceptor(chuckerInterceptor) + if (enableChucker) { + val chuckerCollector = ChuckerCollector(this, true, RetentionManager.Period.ONE_HOUR) + val chuckerInterceptor = ChuckerInterceptor(this, chuckerCollector) + builder.addInterceptor(chuckerInterceptor) + } } - builder.build() + http = builder.build() + + httpLazy = http.newBuilder() + .followRedirects(false) + .followSslRedirects(false) + .build() + + MHttp.instance().customOkHttpClient(http) } - val httpLazy: OkHttpClient by lazy { - http.newBuilder() - .followRedirects(false) - .followSslRedirects(false) - .build() - } - val cookieJar by lazy { PersistentCookieJar(SetCookieCache(), SharedPrefsCookiePersistor(this)) } + val cookieJar by lazy { DumbCookieJar(this) } /* _____ _ _ / ____(_) | | @@ -77,22 +143,7 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop |_____/|_|\__, |_| |_|\__,_|\__|\__,_|_| \___| __/ | |__*/ - private val deviceId: String by lazy { Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID) ?: "" } - private val signature: String by lazy { - var str = "" - try { - val packageInfo: PackageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES) - for (signature in packageInfo.signatures) { - val signatureBytes = signature.toByteArray() - val md = MessageDigest.getInstance("SHA") - md.update(signatureBytes) - str = Base64.encodeToString(md.digest(), Base64.DEFAULT) - } - } catch (e: Exception) { - e.printStackTrace() - } - str - } + val deviceId: String by lazy { Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID) ?: "" } private var unreadBadgesAvailable = true /* _____ _ @@ -117,194 +168,256 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop .errorActivity(CrashActivity::class.java) .apply() Iconics.init(applicationContext) - Iconics.registerFont(SzkolnyFont) - db = AppDb.getDatabase(this) - Themes.themeInt = config.ui.theme - MHttp.instance().customOkHttpClient(http) + Iconics.respectFontBoundsDefault = true - devMode = "f054761fbdb6a238" == deviceId || BuildConfig.DEBUG - if (config.devModePassword != null) - checkDevModePassword() + // initialize companion object values + App.db = AppDb(this) + App.config = Config(App.db) + App.profile = Profile(0, 0, 0, "") + debugMode = BuildConfig.DEBUG + devMode = config.devMode ?: debugMode + enableChucker = config.enableChucker ?: devMode + + if (!profileLoadById(config.lastProfileId)) { + db.profileDao().firstId?.let { profileLoadById(it) } + } + + buildHttp() + + Themes.themeInt = config.ui.theme + config.ui.language?.let { + setLanguage(it) + } Signing.getCert(this) - launch { async(Dispatchers.Default) { - if (config.sync.enabled) { - scheduleNext(this@App, false) - } else { - cancelNext(this@App) + launch { + withContext(Dispatchers.Default) { + config.migrate(this@App) + + SSLProvider.install( + applicationContext, + downloadIfNeeded = true, + supportTls13 = false, + onFinish = { + buildHttp() + }, + onError = { + Timber.e("Failed to install SSLProvider: $it") + it.printStackTrace() + } + ) + + if (config.devModePassword != null) + checkDevModePassword() + + if (config.sync.enabled) + SyncWorker.scheduleNext(this@App, false) + else + SyncWorker.cancelNext(this@App) + + if (config.sync.notifyAboutUpdates) + UpdateWorker.scheduleNext(this@App, false) + else + UpdateWorker.cancelNext(this@App) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { + val shortcutManager = getSystemService(ShortcutManager::class.java) + + val shortcutTimetable = ShortcutInfo.Builder(this@App, "item_timetable") + .setShortLabel(getString(R.string.shortcut_timetable)).setLongLabel(getString(R.string.shortcut_timetable)) + .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_timetable)) + .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java) + .putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE)) + .build() + + val shortcutAgenda = ShortcutInfo.Builder(this@App, "item_agenda") + .setShortLabel(getString(R.string.shortcut_agenda)).setLongLabel(getString(R.string.shortcut_agenda)) + .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_agenda)) + .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java) + .putExtra("fragmentId", MainActivity.DRAWER_ITEM_AGENDA)) + .build() + + val shortcutGrades = ShortcutInfo.Builder(this@App, "item_grades") + .setShortLabel(getString(R.string.shortcut_grades)).setLongLabel(getString(R.string.shortcut_grades)) + .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_grades)) + .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java) + .putExtra("fragmentId", MainActivity.DRAWER_ITEM_GRADES)) + .build() + + val shortcutHomework = ShortcutInfo.Builder(this@App, "item_homeworks") + .setShortLabel(getString(R.string.shortcut_homework)).setLongLabel(getString(R.string.shortcut_homework)) + .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_homework)) + .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java) + .putExtra("fragmentId", MainActivity.DRAWER_ITEM_HOMEWORK)) + .build() + + val shortcutMessages = ShortcutInfo.Builder(this@App, "item_messages") + .setShortLabel(getString(R.string.shortcut_messages)).setLongLabel(getString(R.string.shortcut_messages)) + .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_messages)) + .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java) + .putExtra("fragmentId", MainActivity.DRAWER_ITEM_MESSAGES)) + .build() + + shortcutManager.dynamicShortcuts = listOf( + shortcutTimetable, + shortcutAgenda, + shortcutGrades, + shortcutHomework, + shortcutMessages + ) + } // shortcuts - end + + notificationChannelsManager.registerAllChannels() + + + if (config.appInstalledTime == 0L) + try { + config.appInstalledTime = packageManager.getPackageInfo(packageName, 0).firstInstallTime + config.appRateSnackbarTime = config.appInstalledTime + 7 * DAY * MS + } catch (e: PackageManager.NameNotFoundException) { + e.printStackTrace() + } + + val pushMobidziennikApp = FirebaseApp.initializeApp( + this@App, + FirebaseOptions.Builder() + .setProjectId("mobidziennik") + .setStorageBucket("mobidziennik.appspot.com") + .setDatabaseUrl("https://mobidziennik.firebaseio.com") + .setGcmSenderId("747285019373") + .setApiKey("AIzaSyCi5LmsZ5BBCQnGtrdvWnp1bWLCNP8OWQE") + .setApplicationId("1:747285019373:android:f6341bf7b158621d") + .build(), + "Mobidziennik2" + ) + + val pushLibrusApp = FirebaseApp.initializeApp( + this@App, + FirebaseOptions.Builder() + .setProjectId("synergiadru") + .setStorageBucket("synergiadru.appspot.com") + .setDatabaseUrl("https://synergiadru.firebaseio.com") + .setGcmSenderId("513056078587") + .setApiKey("AIzaSyDfTuEoYPKdv4aceEws1CO3n0-HvTndz-o") + .setApplicationId("1:513056078587:android:1e29083b760af544") + .build(), + "Librus" + ) + + val pushVulcanApp = FirebaseApp.initializeApp( + this@App, + FirebaseOptions.Builder() + .setProjectId("dzienniczekplus") + .setStorageBucket("dzienniczekplus.appspot.com") + .setDatabaseUrl("https://dzienniczekplus.firebaseio.com") + .setGcmSenderId("987828170337") + .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA") + .setApplicationId("1:987828170337:android:ac97431a0a4578c3") + .build(), + "Vulcan" + ) + + val pushVulcanHebeApp = FirebaseApp.initializeApp( + this@App, + FirebaseOptions.Builder() + .setProjectId("dzienniczekplus") + .setStorageBucket("dzienniczekplus.appspot.com") + .setDatabaseUrl("https://dzienniczekplus.firebaseio.com") + .setGcmSenderId("987828170337") + .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA") + .setApplicationId("1:987828170337:android:7e16404b9e5deaaa") + .build(), + "VulcanHebe" + ) + + try { + FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult -> + val token = instanceIdResult.token + d("Firebase", "Got App token: $token") + config.sync.tokenApp = token + } + FirebaseInstanceId.getInstance(pushMobidziennikApp).instanceId.addOnSuccessListener { instanceIdResult -> + val token = instanceIdResult.token + d("Firebase", "Got Mobidziennik2 token: $token") + if (token != config.sync.tokenMobidziennik) { + config.sync.tokenMobidziennik = token + config.sync.tokenMobidziennikList = listOf() + } + } + FirebaseInstanceId.getInstance(pushLibrusApp).instanceId.addOnSuccessListener { instanceIdResult -> + val token = instanceIdResult.token + d("Firebase", "Got Librus token: $token") + if (token != config.sync.tokenLibrus) { + config.sync.tokenLibrus = token + config.sync.tokenLibrusList = listOf() + } + } + FirebaseInstanceId.getInstance(pushVulcanApp).instanceId.addOnSuccessListener { instanceIdResult -> + val token = instanceIdResult.token + d("Firebase", "Got Vulcan token: $token") + if (token != config.sync.tokenVulcan) { + config.sync.tokenVulcan = token + config.sync.tokenVulcanList = listOf() + } + } + FirebaseInstanceId.getInstance(pushVulcanHebeApp).instanceId.addOnSuccessListener { instanceIdResult -> + val token = instanceIdResult.token + d("Firebase", "Got VulcanHebe token: $token") + if (token != config.sync.tokenVulcanHebe) { + config.sync.tokenVulcanHebe = token + config.sync.tokenVulcanHebeList = listOf() + } + } + FirebaseMessaging.getInstance().subscribeToTopic(packageName) + } catch (e: IllegalStateException) { + e.printStackTrace() + } } db.metadataDao().countUnseen().observeForever { count: Int -> if (unreadBadgesAvailable) unreadBadgesAvailable = ShortcutBadger.applyCount(this@App, count) } - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { - val shortcutManager = getSystemService(ShortcutManager::class.java) - - val shortcutTimetable = ShortcutInfo.Builder(this@App, "item_timetable") - .setShortLabel(getString(R.string.shortcut_timetable)).setLongLabel(getString(R.string.shortcut_timetable)) - .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_timetable)) - .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java) - .putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE)) - .build() - - val shortcutAgenda = ShortcutInfo.Builder(this@App, "item_agenda") - .setShortLabel(getString(R.string.shortcut_agenda)).setLongLabel(getString(R.string.shortcut_agenda)) - .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_agenda)) - .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java) - .putExtra("fragmentId", MainActivity.DRAWER_ITEM_AGENDA)) - .build() - - val shortcutGrades = ShortcutInfo.Builder(this@App, "item_grades") - .setShortLabel(getString(R.string.shortcut_grades)).setLongLabel(getString(R.string.shortcut_grades)) - .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_grades)) - .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java) - .putExtra("fragmentId", MainActivity.DRAWER_ITEM_GRADES)) - .build() - - val shortcutHomework = ShortcutInfo.Builder(this@App, "item_homeworks") - .setShortLabel(getString(R.string.shortcut_homework)).setLongLabel(getString(R.string.shortcut_homework)) - .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_homework)) - .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java) - .putExtra("fragmentId", MainActivity.DRAWER_ITEM_HOMEWORK)) - .build() - - val shortcutMessages = ShortcutInfo.Builder(this@App, "item_messages") - .setShortLabel(getString(R.string.shortcut_messages)).setLongLabel(getString(R.string.shortcut_messages)) - .setIcon(Icon.createWithResource(this@App, R.mipmap.ic_shortcut_messages)) - .setIntent(Intent(Intent.ACTION_MAIN, null, this@App, MainActivity::class.java) - .putExtra("fragmentId", MainActivity.DRAWER_ITEM_MESSAGES)) - .build() - - shortcutManager.dynamicShortcuts = listOf( - shortcutTimetable, - shortcutAgenda, - shortcutGrades, - shortcutHomework, - shortcutMessages - ) - } // shortcuts - end - - if (config.appInstalledTime == 0L) - try { - config.appInstalledTime = packageManager.getPackageInfo(packageName, 0).firstInstallTime - config.appRateSnackbarTime = config.appInstalledTime + 7*DAY*MS - } catch (e: NameNotFoundException) { - e.printStackTrace() - } - - val pushMobidziennikApp = FirebaseApp.initializeApp( - this@App, - FirebaseOptions.Builder() - .setApiKey("AIzaSyCi5LmsZ5BBCQnGtrdvWnp1bWLCNP8OWQE") - .setApplicationId("1:747285019373:android:f6341bf7b158621d") - .build(), - "Mobidziennik2" - ) - - val pushLibrusApp = FirebaseApp.initializeApp( - this@App, - FirebaseOptions.Builder() - .setApiKey("AIzaSyDfTuEoYPKdv4aceEws1CO3n0-HvTndz-o") - .setApplicationId("1:513056078587:android:1e29083b760af544") - .build(), - "Librus" - ) - - val pushVulcanApp = FirebaseApp.initializeApp( - this@App, - FirebaseOptions.Builder() - .setApiKey("AIzaSyDW8MUtanHy64_I0oCpY6cOxB3jrvJd_iA") - .setApplicationId("1:987828170337:android:ac97431a0a4578c3") - .build(), - "Vulcan" - ) - - try { - FirebaseInstanceId.getInstance().instanceId.addOnSuccessListener { instanceIdResult -> - val token = instanceIdResult.token - config.sync.tokenApp = token - } - FirebaseInstanceId.getInstance(pushMobidziennikApp).instanceId.addOnSuccessListener { instanceIdResult -> - val token = instanceIdResult.token - if (token != config.sync.tokenMobidziennik) { - config.sync.tokenMobidziennik = token - config.sync.tokenMobidziennikList = listOf() - } - } - FirebaseInstanceId.getInstance(pushLibrusApp).instanceId.addOnSuccessListener { instanceIdResult -> - val token = instanceIdResult.token - if (token != config.sync.tokenLibrus) { - config.sync.tokenLibrus = token - config.sync.tokenLibrusList = listOf() - } - } - FirebaseInstanceId.getInstance(pushVulcanApp).instanceId.addOnSuccessListener { instanceIdResult -> - val token = instanceIdResult.token - if (token != config.sync.tokenVulcan) { - config.sync.tokenVulcan = token - config.sync.tokenVulcanList = listOf() - } - } - FirebaseMessaging.getInstance().subscribeToTopic(packageName) - } catch (e: IllegalStateException) { - e.printStackTrace() - } - }} - } - - private fun profileLoad(profileId: Int) { - db.profileDao().getFullByIdNow(profileId)?.also { - profile = it - } ?: run { - if (!::profile.isInitialized) { - profile = ProfileFull(-1, "", "", -1) - } } } - fun profileLoad(profileId: Int, onSuccess: (profile: ProfileFull) -> Unit) { + + private fun profileLoadById(profileId: Int): Boolean { + db.profileDao().getByIdNow(profileId)?.also { + App.profile = it + App.config.lastProfileId = it.id + return true + } + return false + } + fun profileLoad(profileId: Int, onSuccess: (profile: Profile) -> Unit) { launch { - val deferred = async(Dispatchers.Default) { - profileLoad(profileId) + val success = withContext(Dispatchers.Default) { + profileLoadById(profileId) } - deferred.await() - onSuccess(profile) + if (success) + onSuccess(profile) + else + profileLoadLast(onSuccess) } } - - private fun OkHttpClient.Builder.installHttpsSupport() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { - try { - try { - ProviderInstaller.installIfNeeded(this@App) - } catch (e: Exception) { - Log.e("OkHttpTLSCompat", "Play Services not found or outdated") - - val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()) - trustManagerFactory.init(null as KeyStore?) - - val x509TrustManager = trustManagerFactory.trustManagers.singleOrNull { it is X509TrustManager } as X509TrustManager? - ?: return - - val sc = SSLContext.getInstance("TLSv1.2") - sc.init(null, null, null) - sslSocketFactory(TLSSocketFactory(sc.socketFactory), x509TrustManager) - val cs: ConnectionSpec = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS) - .tlsVersions(TlsVersion.TLS_1_0) - .tlsVersions(TlsVersion.TLS_1_1) - .tlsVersions(TlsVersion.TLS_1_2) - .build() - val specs: MutableList = ArrayList() - specs.add(cs) - specs.add(ConnectionSpec.COMPATIBLE_TLS) - specs.add(ConnectionSpec.CLEARTEXT) - connectionSpecs(specs) - } - } catch (exc: Exception) { - Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc) + fun profileLoadLast(onSuccess: (profile: Profile) -> Unit) { + launch { + val success = withContext(Dispatchers.Default) { + profileLoadById(db.profileDao().lastId ?: return@withContext false) } + if (!success) { + EventBus.getDefault().post(ProfileListEmptyEvent()) + } + else { + onSuccess(profile) + } + } + } + fun profileSave() = profileSave(profile) + fun profileSave(profile: Profile) { + launch(Dispatchers.Default) { + App.db.profileDao().add(profile) } } @@ -315,5 +428,5 @@ class Szkolny : /*MultiDexApplication(),*/ Configuration.Provider, CoroutineScop e.printStackTrace() false } - }*/ -} \ No newline at end of file + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Binding.java b/app/src/main/java/pl/szczodrzynski/edziennik/Binding.java deleted file mode 100644 index d9c97a16..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/Binding.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-11-11. - */ - -package pl.szczodrzynski.edziennik; - -import android.graphics.Paint; -import android.widget.TextView; - -import androidx.databinding.BindingAdapter; - -public class Binding { - @BindingAdapter("strikeThrough") - public static void strikeThrough(TextView textView, Boolean strikeThrough) { - if (strikeThrough) { - textView.setPaintFlags(textView.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); - } else { - textView.setPaintFlags(textView.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Binding.kt b/app/src/main/java/pl/szczodrzynski/edziennik/Binding.kt new file mode 100644 index 00000000..3dc9d0a6 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/Binding.kt @@ -0,0 +1,20 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-11-11. + */ +package pl.szczodrzynski.edziennik + +import android.graphics.Paint +import android.widget.TextView +import androidx.databinding.BindingAdapter + +object Binding { + @JvmStatic + @BindingAdapter("strikeThrough") + fun strikeThrough(textView: TextView, strikeThrough: Boolean) { + if (strikeThrough) { + textView.paintFlags = textView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG + } else { + textView.paintFlags = textView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt index e327d770..42eed408 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt @@ -1,36 +1,48 @@ package pl.szczodrzynski.edziennik -import android.Manifest -import android.app.Activity +import android.content.ClipData +import android.content.ClipboardManager import android.content.Context -import android.content.pm.PackageManager +import android.content.Intent +import android.content.res.ColorStateList import android.content.res.Resources +import android.database.Cursor import android.graphics.PorterDuff import android.graphics.PorterDuffColorFilter +import android.graphics.Rect import android.graphics.Typeface import android.graphics.drawable.Drawable import android.os.Build import android.os.Bundle +import android.os.Parcelable import android.text.* +import android.text.style.CharacterStyle import android.text.style.ForegroundColorSpan import android.text.style.StrikethroughSpan import android.text.style.StyleSpan +import android.util.* +import android.util.Base64 import android.util.Base64.NO_WRAP import android.util.Base64.encodeToString -import android.util.LongSparseArray -import android.util.SparseArray -import android.util.TypedValue import android.view.View -import android.widget.CompoundButton -import android.widget.TextView +import android.view.WindowManager +import android.widget.* import androidx.annotation.* -import androidx.core.app.ActivityCompat +import androidx.core.database.getIntOrNull +import androidx.core.database.getLongOrNull +import androidx.core.database.getStringOrNull import androidx.core.util.forEach import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LiveData import androidx.lifecycle.Observer +import androidx.recyclerview.widget.RecyclerView +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout +import androidx.viewpager.widget.ViewPager +import com.google.android.material.button.MaterialButton +import com.google.android.material.datepicker.CalendarConstraints +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.google.gson.* import com.google.gson.JsonArray -import com.google.gson.JsonElement import com.google.gson.JsonObject import im.wangchao.mhttp.Response import kotlinx.coroutines.CoroutineScope @@ -38,18 +50,31 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import okhttp3.RequestBody import okio.Buffer -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile -import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApiException +import pl.szczodrzynski.edziennik.data.api.szkolny.response.ApiResponse +import pl.szczodrzynski.edziennik.data.db.entity.Notification +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.entity.Team import pl.szczodrzynski.edziennik.utils.models.Time -import pl.szczodrzynski.navlib.getColorFromRes +import java.io.InterruptedIOException +import java.io.PrintWriter +import java.io.StringWriter import java.math.BigInteger +import java.net.ConnectException +import java.net.SocketTimeoutException +import java.net.UnknownHostException +import java.nio.charset.Charset import java.security.MessageDigest import java.text.SimpleDateFormat import java.util.* import java.util.zip.CRC32 import javax.crypto.Mac import javax.crypto.spec.SecretKeySpec +import javax.net.ssl.SSLException +import kotlin.Pair fun List.byId(id: Long) = firstOrNull { it.id == id } @@ -60,28 +85,61 @@ fun List.byNameFDotSpaceLast(nameFDotSpaceLast: String) = firstOrNull { fun JsonObject?.get(key: String): JsonElement? = this?.get(key) -fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (it.isJsonNull) null else it.asBoolean } -fun JsonObject?.getString(key: String): String? = get(key)?.let { if (it.isJsonNull) null else it.asString } -fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (it.isJsonNull) null else it.asInt } -fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (it.isJsonNull) null else it.asLong } -fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(it.isJsonNull) null else it.asFloat } -fun JsonObject?.getJsonObject(key: String): JsonObject? = get(key)?.let { if (it.isJsonNull) null else it.asJsonObject } -fun JsonObject?.getJsonArray(key: String): JsonArray? = get(key)?.let { if (it.isJsonNull) null else it.asJsonArray } +fun JsonObject?.getBoolean(key: String): Boolean? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asBoolean } +fun JsonObject?.getString(key: String): String? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asString } +fun JsonObject?.getInt(key: String): Int? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asInt } +fun JsonObject?.getLong(key: String): Long? = get(key)?.let { if (!it.isJsonPrimitive) null else it.asLong } +fun JsonObject?.getFloat(key: String): Float? = get(key)?.let { if(!it.isJsonPrimitive) null else it.asFloat } +fun JsonObject?.getChar(key: String): Char? = get(key)?.let { if(!it.isJsonPrimitive) null else it.asCharacter } +fun JsonObject?.getJsonObject(key: String): JsonObject? = get(key)?.let { if (it.isJsonObject) it.asJsonObject else null } +fun JsonObject?.getJsonArray(key: String): JsonArray? = get(key)?.let { if (it.isJsonArray) it.asJsonArray else null } -fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (it.isJsonNull) defaultValue else it.asBoolean } ?: defaultValue -fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (it.isJsonNull) defaultValue else it.asString } ?: defaultValue -fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (it.isJsonNull) defaultValue else it.asInt } ?: defaultValue -fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (it.isJsonNull) defaultValue else it.asLong } ?: defaultValue -fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(it.isJsonNull) defaultValue else it.asFloat } ?: defaultValue -fun JsonObject?.getJsonObject(key: String, defaultValue: JsonObject): JsonObject = get(key)?.let { if (it.isJsonNull) defaultValue else it.asJsonObject } ?: defaultValue -fun JsonObject?.getJsonArray(key: String, defaultValue: JsonArray): JsonArray = get(key)?.let { if (it.isJsonNull) defaultValue else it.asJsonArray } ?: defaultValue +fun JsonObject?.getBoolean(key: String, defaultValue: Boolean): Boolean = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asBoolean } ?: defaultValue +fun JsonObject?.getString(key: String, defaultValue: String): String = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asString } ?: defaultValue +fun JsonObject?.getInt(key: String, defaultValue: Int): Int = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asInt } ?: defaultValue +fun JsonObject?.getLong(key: String, defaultValue: Long): Long = get(key)?.let { if (!it.isJsonPrimitive) defaultValue else it.asLong } ?: defaultValue +fun JsonObject?.getFloat(key: String, defaultValue: Float): Float = get(key)?.let { if(!it.isJsonPrimitive) defaultValue else it.asFloat } ?: defaultValue +fun JsonObject?.getChar(key: String, defaultValue: Char): Char = get(key)?.let { if(!it.isJsonPrimitive) defaultValue else it.asCharacter } ?: defaultValue +fun JsonObject?.getJsonObject(key: String, defaultValue: JsonObject): JsonObject = get(key)?.let { if (it.isJsonObject) it.asJsonObject else defaultValue } ?: defaultValue +fun JsonObject?.getJsonArray(key: String, defaultValue: JsonArray): JsonArray = get(key)?.let { if (it.isJsonArray) it.asJsonArray else defaultValue } ?: defaultValue -fun JsonArray?.asJsonObjectList() = this?.map { it.asJsonObject } +fun JsonArray.getBoolean(key: Int): Boolean? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asBoolean } +fun JsonArray.getString(key: Int): String? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asString } +fun JsonArray.getInt(key: Int): Int? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asInt } +fun JsonArray.getLong(key: Int): Long? = if (key >= size()) null else get(key)?.let { if (!it.isJsonPrimitive) null else it.asLong } +fun JsonArray.getFloat(key: Int): Float? = if (key >= size()) null else get(key)?.let { if(!it.isJsonPrimitive) null else it.asFloat } +fun JsonArray.getChar(key: Int): Char? = if (key >= size()) null else get(key)?.let { if(!it.isJsonPrimitive) null else it.asCharacter } +fun JsonArray.getJsonObject(key: Int): JsonObject? = if (key >= size()) null else get(key)?.let { if (it.isJsonObject) it.asJsonObject else null } +fun JsonArray.getJsonArray(key: Int): JsonArray? = if (key >= size()) null else get(key)?.let { if (it.isJsonArray) it.asJsonArray else null } + +fun String.toJsonObject(): JsonObject? = try { JsonParser().parse(this).asJsonObject } catch (ignore: Exception) { null } + +operator fun JsonObject.set(key: String, value: JsonElement) = this.add(key, value) +operator fun JsonObject.set(key: String, value: Boolean) = this.addProperty(key, value) +operator fun JsonObject.set(key: String, value: String?) = this.addProperty(key, value) +operator fun JsonObject.set(key: String, value: Number) = this.addProperty(key, value) +operator fun JsonObject.set(key: String, value: Char) = this.addProperty(key, value) + +operator fun Profile.set(key: String, value: JsonElement) = this.studentData.add(key, value) +operator fun Profile.set(key: String, value: Boolean) = this.studentData.addProperty(key, value) +operator fun Profile.set(key: String, value: String?) = this.studentData.addProperty(key, value) +operator fun Profile.set(key: String, value: Number) = this.studentData.addProperty(key, value) +operator fun Profile.set(key: String, value: Char) = this.studentData.addProperty(key, value) + +fun JsonArray.asJsonObjectList() = this.mapNotNull { it.asJsonObject } fun CharSequence?.isNotNullNorEmpty(): Boolean { return this != null && this.isNotEmpty() } +fun Collection?.isNotNullNorEmpty(): Boolean { + return this != null && this.isNotEmpty() +} + +fun CharSequence?.isNotNullNorBlank(): Boolean { + return this != null && this.isNotBlank() +} + fun currentTimeUnix() = System.currentTimeMillis() / 1000 fun Bundle?.getInt(key: String, defaultValue: Int): Int { @@ -97,12 +155,38 @@ fun Bundle?.getString(key: String, defaultValue: String): String { return this?.getString(key, defaultValue) ?: defaultValue } -fun String.fixName(): String { - return this.fixWhiteSpaces().toProperCase() +fun Bundle?.getIntOrNull(key: String): Int? { + return this?.get(key) as? Int +} +fun Bundle?.get(key: String): T? { + return this?.get(key) as? T? } +/** + * ` The quick BROWN_fox Jumps OveR THE LAZy-DOG. ` + * + * converts to + * + * `The Quick Brown_fox Jumps Over The Lazy-Dog.` + */ +fun String?.fixName(): String { + return this?.fixWhiteSpaces()?.toProperCase() ?: "" +} + +/** + * `The quick BROWN_fox Jumps OveR THE LAZy-DOG.` + * + * converts to + * + * `The Quick Brown_fox Jumps Over The Lazy-Dog.` + */ fun String.toProperCase(): String = changeStringCase(this) +/** + * `John Smith` -> `Smith John` + * + * `JOHN SMith` -> `SMith JOHN` + */ fun String.swapFirstLastName(): String { return this.split(" ").let { if (it.size > 1) @@ -112,15 +196,13 @@ fun String.swapFirstLastName(): String { } } -fun String.getFirstLastName(): Pair? { +fun String.splitName(): Pair? { return this.split(" ").let { if (it.size >= 2) Pair(it[0], it[1]) else null } } -fun String.getLastFirstName() = this.getFirstLastName() - fun changeStringCase(s: String): String { val delimiters = " '-/" val sb = StringBuilder() @@ -150,52 +232,67 @@ fun String.getShortName(): String { } } +/** + * "John Smith" -> "JS" + * + * "JOHN SMith" -> "JS" + * + * "John" -> "J" + * + * "John " -> "J" + * + * "John Smith " -> "JS" + * + * " " -> "" + * + * " " -> "" + */ +fun String?.getNameInitials(): String { + if (this.isNullOrBlank()) return "" + return this.toUpperCase().fixWhiteSpaces().split(" ").take(2).map { it[0] }.joinToString("") +} + fun List.join(delimiter: String): String { - return this.joinToString(delimiter) + return concat(delimiter).toString() } -fun colorFromName(context: Context, name: String?): Int { - var crc = (name ?: "").crc16() - crc = (crc and 0xff) or (crc shr 8) - crc %= 16 - val color = when (crc) { - 13 -> R.color.md_red_500 - 4 -> R.color.md_pink_A400 - 2 -> R.color.md_purple_A400 - 9 -> R.color.md_deep_purple_A700 - 5 -> R.color.md_indigo_500 - 1 -> R.color.md_indigo_A700 - 6 -> R.color.md_cyan_A200 - 14 -> R.color.md_teal_400 - 15 -> R.color.md_green_500 - 7 -> R.color.md_yellow_A700 - 3 -> R.color.md_deep_orange_A400 - 8 -> R.color.md_deep_orange_A700 - 10 -> R.color.md_brown_500 - 12 -> R.color.md_grey_400 - 11 -> R.color.md_blue_grey_400 - else -> R.color.md_light_green_A700 - } - return context.getColorFromRes(color) +fun colorFromName(name: String?): Int { + val i = (name ?: "").crc32() + return when ((i / 10 % 16 + 1).toInt()) { + 13 -> 0xffF44336 + 4 -> 0xffF50057 + 2 -> 0xffD500F9 + 9 -> 0xff6200EA + 5 -> 0xffFFAB00 + 1 -> 0xff304FFE + 6 -> 0xff40C4FF + 14 -> 0xff26A69A + 15 -> 0xff00C853 + 7 -> 0xffFFD600 + 3 -> 0xffFF3D00 + 8 -> 0xffDD2C00 + 10 -> 0xff795548 + 12 -> 0xff2979FF + 11 -> 0xffFF6D00 + else -> 0xff64DD17 + }.toInt() } -fun MutableList.filterOutArchived(): MutableList { - this.removeAll { it.archived } - return this +fun colorFromCssName(name: String): Int { + return when (name) { + "red" -> 0xffff0000 + "green" -> 0xff008000 + "blue" -> 0xff0000ff + "violet" -> 0xffee82ee + "brown" -> 0xffa52a2a + "orange" -> 0xffffa500 + "black" -> 0xff000000 + "white" -> 0xffffffff + else -> -1L + }.toInt() } -fun Activity.isStoragePermissionGranted(): Boolean { - return if (Build.VERSION.SDK_INT >= 23) { - if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { - true - } else { - ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 1) - false - } - } else { - true - } -} +fun List.filterOutArchived() = this.filter { !it.archived } fun Response?.getUnixDate(): Long { val rfcDate = this?.headers()?.get("date") ?: return currentTimeUnix() @@ -220,6 +317,13 @@ fun LongSparseArray.values(): List { return result } +fun SparseArray<*>.keys(): List { + val result = mutableListOf() + forEach { key, _ -> + result += key + } + return result +} fun SparseArray.values(): List { val result = mutableListOf() forEach { _, value -> @@ -228,6 +332,36 @@ fun SparseArray.values(): List { return result } +fun SparseIntArray.keys(): List { + val result = mutableListOf() + forEach { key, _ -> + result += key + } + return result +} +fun SparseIntArray.values(): List { + val result = mutableListOf() + forEach { _, value -> + result += value + } + return result +} + +fun List>.keys(): List { + val result = mutableListOf() + forEach { pair -> + result += pair.first + } + return result +} +fun List>.values(): List { + val result = mutableListOf() + forEach { pair -> + result += pair.second + } + return result +} + fun List.toSparseArray(destination: SparseArray, key: (T) -> Int) { forEach { destination.put(key(it), it) @@ -297,7 +431,7 @@ operator fun MatchResult.get(group: Int): String { return groupValues[group] } -fun Activity.setLanguage(language: String) { +fun Context.setLanguage(language: String) { val locale = Locale(language.toLowerCase(Locale.ROOT)) val configuration = resources.configuration Locale.setDefault(locale) @@ -306,7 +440,6 @@ fun Activity.setLanguage(language: String) { } configuration.locale = locale resources.updateConfiguration(configuration, resources.displayMetrics) - baseContext.resources.updateConfiguration(configuration, baseContext.resources.displayMetrics) } /* @@ -381,6 +514,12 @@ fun String.md5(): String { return BigInteger(1, md.digest(toByteArray())).toString(16).padStart(32, '0') } +fun String.sha1Hex(): String { + val md = MessageDigest.getInstance("SHA-1") + md.update(toByteArray()) + return md.digest().joinToString("") { "%02x".format(it) } +} + fun String.sha256(): ByteArray { val md = MessageDigest.getInstance("SHA-256") md.update(toByteArray()) @@ -410,6 +549,74 @@ fun CharSequence?.asItalicSpannable(): Spannable { spannable.setSpan(StyleSpan(Typeface.ITALIC), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) return spannable } +fun CharSequence?.asBoldSpannable(): Spannable { + val spannable = SpannableString(this) + spannable.setSpan(StyleSpan(Typeface.BOLD), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + return spannable +} +fun CharSequence.asSpannable( + vararg spans: CharacterStyle, + substring: CharSequence? = null, + ignoreCase: Boolean = false, + ignoreDiacritics: Boolean = false +): Spannable { + val spannable = SpannableString(this) + substring?.let { substr -> + val string = if (ignoreDiacritics) + this.cleanDiacritics() + else + this + val search = if (ignoreDiacritics) + substr.cleanDiacritics() + else + substr.toString() + + var index = 0 + do { + index = string.indexOf( + string = search, + startIndex = index, + ignoreCase = ignoreCase + ) + + if (index >= 0) { + spans.forEach { + spannable.setSpan( + CharacterStyle.wrap(it), + index, + index + substring.length, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ) + } + index += substring.length.coerceAtLeast(1) + } + } while (index >= 0) + + } ?: spans.forEach { + spannable.setSpan(it, 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + } + return spannable +} + +fun CharSequence.cleanDiacritics(): String { + val nameClean = StringBuilder() + forEach { + val ch = when (it) { + 'ż' -> 'z' + 'ó' -> 'o' + 'ł' -> 'l' + 'ć' -> 'c' + 'ę' -> 'e' + 'ś' -> 's' + 'ą' -> 'a' + 'ź' -> 'z' + 'ń' -> 'n' + else -> it + } + nameClean.append(ch) + } + return nameClean.toString() +} /** * Returns a new read-only list only of those given elements, that are not empty. @@ -417,7 +624,7 @@ fun CharSequence?.asItalicSpannable(): Spannable { */ fun listOfNotEmpty(vararg elements: T): List = elements.filterNot { it.isEmpty() } -fun List.concat(delimiter: String? = null): CharSequence { +fun List.concat(delimiter: CharSequence? = null): CharSequence { if (this.isEmpty()) { return "" } @@ -426,11 +633,13 @@ fun List.concat(delimiter: String? = null): CharSequence { return this[0] ?: "" } - var spanned = false - for (piece in this) { - if (piece is Spanned) { - spanned = true - break + var spanned = delimiter is Spanned + if (!spanned) { + for (piece in this) { + if (piece is Spanned) { + spanned = true + break + } } } @@ -464,6 +673,16 @@ fun TextView.setText(@StringRes resid: Int, vararg formatArgs: Any) { text = context.getString(resid, *formatArgs) } +fun MaterialAlertDialogBuilder.setTitle(@StringRes resid: Int, vararg formatArgs: Any): MaterialAlertDialogBuilder { + setTitle(context.getString(resid, *formatArgs)) + return this +} + +fun MaterialAlertDialogBuilder.setMessage(@StringRes resid: Int, vararg formatArgs: Any): MaterialAlertDialogBuilder { + setMessage(context.getString(resid, *formatArgs)) + return this +} + fun JsonObject(vararg properties: Pair): JsonObject { return JsonObject().apply { for (property in properties) { @@ -478,8 +697,88 @@ fun JsonObject(vararg properties: Pair): JsonObject { } } +fun JsonObject.toBundle(): Bundle { + return Bundle().also { + for ((key, value) in this.entrySet()) { + when (value) { + is JsonObject -> it.putBundle(key, value.toBundle()) + is JsonPrimitive -> when { + value.isString -> it.putString(key, value.asString) + value.isBoolean -> it.putBoolean(key, value.asBoolean) + value.isNumber -> it.putInt(key, value.asInt) + } + } + } + } +} + +fun JsonArray(vararg properties: Any?): JsonArray { + return JsonArray().apply { + for (property in properties) { + when (property) { + is JsonElement -> add(property as JsonElement?) + is String -> add(property as String?) + is Char -> add(property as Char?) + is Number -> add(property as Number?) + is Boolean -> add(property as Boolean?) + } + } + } +} + +fun Bundle(vararg properties: Pair): Bundle { + return Bundle().apply { + for (property in properties) { + when (property.second) { + is String -> putString(property.first, property.second as String?) + is Char -> putChar(property.first, property.second as Char) + is Int -> putInt(property.first, property.second as Int) + is Long -> putLong(property.first, property.second as Long) + is Float -> putFloat(property.first, property.second as Float) + is Short -> putShort(property.first, property.second as Short) + is Double -> putDouble(property.first, property.second as Double) + is Boolean -> putBoolean(property.first, property.second as Boolean) + is Array<*> -> putParcelableArray(property.first, property.second as Array) + } + } + } +} +fun Intent(action: String? = null, vararg properties: Pair): Intent { + return Intent(action).putExtras(Bundle(*properties)) +} +fun Intent(packageContext: Context, cls: Class<*>, vararg properties: Pair): Intent { + return Intent(packageContext, cls).putExtras(Bundle(*properties)) +} + +fun Bundle.toJsonObject(): JsonObject { + val json = JsonObject() + keySet()?.forEach { key -> + get(key)?.let { + when (it) { + is String -> json.addProperty(key, it) + is Char -> json.addProperty(key, it) + is Int -> json.addProperty(key, it) + is Long -> json.addProperty(key, it) + is Float -> json.addProperty(key, it) + is Short -> json.addProperty(key, it) + is Double -> json.addProperty(key, it) + is Boolean -> json.addProperty(key, it) + is Bundle -> json.add(key, it.toJsonObject()) + else -> json.addProperty(key, it.toString()) + } + } + } + return json +} +fun Intent.toJsonObject() = extras?.toJsonObject() + fun JsonArray?.isNullOrEmpty(): Boolean = (this?.size() ?: 0) == 0 fun JsonArray.isEmpty(): Boolean = this.size() == 0 +operator fun JsonArray.plusAssign(o: JsonElement) = this.add(o) +operator fun JsonArray.plusAssign(o: String) = this.add(o) +operator fun JsonArray.plusAssign(o: Char) = this.add(o) +operator fun JsonArray.plusAssign(o: Number) = this.add(o) +operator fun JsonArray.plusAssign(o: Boolean) = this.add(o) @Suppress("UNCHECKED_CAST") inline fun T.onClick(crossinline onClickListener: (v: T) -> Unit) { @@ -488,6 +787,13 @@ inline fun T.onClick(crossinline onClickListener: (v: T) -> Unit) { } } +@Suppress("UNCHECKED_CAST") +inline fun T.onLongClick(crossinline onLongClickListener: (v: T) -> Boolean) { + setOnLongClickListener { v: View -> + onLongClickListener(v as T) + } +} + @Suppress("UNCHECKED_CAST") inline fun T.onChange(crossinline onChangeListener: (v: T, isChecked: Boolean) -> Unit) { setOnCheckedChangeListener { buttonView, isChecked -> @@ -495,6 +801,19 @@ inline fun T.onChange(crossinline onChangeListener: (v: T, } } +@Suppress("UNCHECKED_CAST") +inline fun T.onChange(crossinline onChangeListener: (v: T, isChecked: Boolean) -> Unit) { + clearOnCheckedChangeListeners() + addOnCheckedChangeListener { buttonView, isChecked -> + onChangeListener(buttonView as T, isChecked) + } +} + +fun View.attachToastHint(stringRes: Int) = onLongClick { + Toast.makeText(it.context, stringRes, Toast.LENGTH_SHORT).show() + true +} + fun LiveData.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observer) { observe(lifecycleOwner, object : Observer { override fun onChanged(t: T?) { @@ -550,7 +869,7 @@ fun View.findParentById(targetId: Int): View? { return null } -fun CoroutineScope.startCoroutineTimer(delayMillis: Long = 0, repeatMillis: Long = 0, action: () -> Unit) = launch { +fun CoroutineScope.startCoroutineTimer(delayMillis: Long = 0, repeatMillis: Long = 0, action: suspend CoroutineScope.() -> Unit) = launch { delay(delayMillis) if (repeatMillis > 0) { while (true) { @@ -576,52 +895,65 @@ operator fun StringBuilder.plusAssign(str: String?) { this.append(str) } -fun Context.timeTill(time: Int, delimiter: String = " "): String { +fun Context.timeTill(time: Int, delimiter: String = " ", countInSeconds: Boolean = false): String { val parts = mutableListOf>() val hours = time / 3600 val minutes = (time - hours*3600) / 60 val seconds = time - minutes*60 - hours*3600 - var prefixAdded = false - if (hours > 0) { - if (!prefixAdded) parts += R.plurals.time_till_text to hours; prefixAdded = true - parts += R.plurals.time_till_hours to hours - } - if (minutes > 0) { - if (!prefixAdded) parts += R.plurals.time_till_text to minutes; prefixAdded = true - parts += R.plurals.time_till_minutes to minutes - } - if (hours == 0 && minutes < 10) { - if (!prefixAdded) parts += R.plurals.time_till_text to seconds; prefixAdded = true - parts += R.plurals.time_till_seconds to seconds + if (!countInSeconds) { + var prefixAdded = false + if (hours > 0) { + if (!prefixAdded) parts += R.plurals.time_till_text to hours + prefixAdded = true + parts += R.plurals.time_till_hours to hours + } + if (minutes > 0) { + if (!prefixAdded) parts += R.plurals.time_till_text to minutes + prefixAdded = true + parts += R.plurals.time_till_minutes to minutes + } + if (hours == 0 && minutes < 10) { + if (!prefixAdded) parts += R.plurals.time_till_text to seconds + prefixAdded = true + parts += R.plurals.time_till_seconds to seconds + } + } else { + parts += R.plurals.time_till_text to time + parts += R.plurals.time_till_seconds to time } return parts.joinToString(delimiter) { resources.getQuantityString(it.first, it.second, it.second) } } -fun Context.timeLeft(time: Int, delimiter: String = " "): String { +fun Context.timeLeft(time: Int, delimiter: String = " ", countInSeconds: Boolean = false): String { val parts = mutableListOf>() val hours = time / 3600 val minutes = (time - hours*3600) / 60 val seconds = time - minutes*60 - hours*3600 - var prefixAdded = false - if (hours > 0) { - if (!prefixAdded) parts += R.plurals.time_left_text to hours - prefixAdded = true - parts += R.plurals.time_left_hours to hours - } - if (minutes > 0) { - if (!prefixAdded) parts += R.plurals.time_left_text to minutes - prefixAdded = true - parts += R.plurals.time_left_minutes to minutes - } - if (hours == 0 && minutes < 10) { - if (!prefixAdded) parts += R.plurals.time_left_text to seconds - prefixAdded = true - parts += R.plurals.time_left_seconds to seconds + if (!countInSeconds) { + var prefixAdded = false + if (hours > 0) { + if (!prefixAdded) parts += R.plurals.time_left_text to hours + prefixAdded = true + parts += R.plurals.time_left_hours to hours + } + if (minutes > 0) { + if (!prefixAdded) parts += R.plurals.time_left_text to minutes + prefixAdded = true + parts += R.plurals.time_left_minutes to minutes + } + if (hours == 0 && minutes < 10) { + if (!prefixAdded) parts += R.plurals.time_left_text to seconds + prefixAdded = true + parts += R.plurals.time_left_seconds to seconds + } + } else { + parts += R.plurals.time_left_text to time + parts += R.plurals.time_left_seconds to time } return parts.joinToString(delimiter) { resources.getQuantityString(it.first, it.second, it.second) } @@ -641,3 +973,338 @@ fun Drawable.setTintColor(color: Int): Drawable { ) return this } + +inline fun List.ifNotEmpty(block: (List) -> Unit) { + if (!isEmpty()) + block(this) +} + +val String.firstLettersName: String + get() { + var nameShort = "" + this.split(" ").forEach { + if (it.isBlank()) + return@forEach + nameShort += it[0].toLowerCase() + } + return nameShort + } + +val Throwable.stackTraceString: String + get() { + val sw = StringWriter() + printStackTrace(PrintWriter(sw)) + return sw.toString() + } + +inline fun LongSparseArray.filter(predicate: (T) -> Boolean): List { + val destination = ArrayList() + this.forEach { _, element -> if (predicate(element)) destination.add(element) } + return destination +} + +fun CharSequence.replace(oldValue: String, newValue: CharSequence, ignoreCase: Boolean = false): CharSequence = + splitToSequence(oldValue, ignoreCase = ignoreCase).toList().concat(newValue) + +fun Int.toColorStateList(): ColorStateList { + val states = arrayOf( + intArrayOf( android.R.attr.state_enabled ), + intArrayOf(-android.R.attr.state_enabled ), + intArrayOf(-android.R.attr.state_checked ), + intArrayOf( android.R.attr.state_pressed ) + ) + + val colors = intArrayOf( + this, + this, + this, + this + ) + + return ColorStateList(states, colors) +} + +fun SpannableStringBuilder.appendText(text: CharSequence): SpannableStringBuilder { + append(text) + return this +} +fun SpannableStringBuilder.appendSpan(text: CharSequence, what: Any, flags: Int): SpannableStringBuilder { + val start: Int = length + append(text) + setSpan(what, start, length, flags) + return this +} + +fun joinNotNullStrings(delimiter: String = "", vararg parts: String?): String { + var first = true + val sb = StringBuilder() + for (part in parts) { + if (part == null) + continue + if (!first) + sb += delimiter + first = false + sb += part + } + return sb.toString() +} + +fun String.notEmptyOrNull(): String? { + return if (isEmpty()) + null + else + this +} + +fun String.base64Encode(): String { + return encodeToString(toByteArray(), NO_WRAP) +} +fun ByteArray.base64Encode(): String { + return encodeToString(this, NO_WRAP) +} +fun String.base64Decode(): ByteArray { + return Base64.decode(this, Base64.DEFAULT) +} +fun String.base64DecodeToString(): String { + return Base64.decode(this, Base64.DEFAULT).toString(Charset.defaultCharset()) +} + +fun CheckBox.trigger() { isChecked = !isChecked } + +fun Context.plural(@PluralsRes resId: Int, value: Int): String = resources.getQuantityString(resId, value, value) + +fun Context.getNotificationTitle(type: Int): String { + return getString(when (type) { + Notification.TYPE_UPDATE -> R.string.notification_type_update + Notification.TYPE_ERROR -> R.string.notification_type_error + Notification.TYPE_TIMETABLE_CHANGED -> R.string.notification_type_timetable_change + Notification.TYPE_TIMETABLE_LESSON_CHANGE -> R.string.notification_type_timetable_lesson_change + Notification.TYPE_NEW_GRADE -> R.string.notification_type_new_grade + Notification.TYPE_NEW_EVENT -> R.string.notification_type_new_event + Notification.TYPE_NEW_HOMEWORK -> R.string.notification_type_new_homework + Notification.TYPE_NEW_SHARED_EVENT -> R.string.notification_type_new_shared_event + Notification.TYPE_NEW_SHARED_HOMEWORK -> R.string.notification_type_new_shared_homework + Notification.TYPE_REMOVED_SHARED_EVENT -> R.string.notification_type_removed_shared_event + Notification.TYPE_NEW_MESSAGE -> R.string.notification_type_new_message + Notification.TYPE_NEW_NOTICE -> R.string.notification_type_notice + Notification.TYPE_NEW_ATTENDANCE -> R.string.notification_type_attendance + Notification.TYPE_SERVER_MESSAGE -> R.string.notification_type_server_message + Notification.TYPE_LUCKY_NUMBER -> R.string.notification_type_lucky_number + Notification.TYPE_FEEDBACK_MESSAGE -> R.string.notification_type_feedback_message + Notification.TYPE_NEW_ANNOUNCEMENT -> R.string.notification_type_new_announcement + Notification.TYPE_AUTO_ARCHIVING -> R.string.notification_type_auto_archiving + Notification.TYPE_TEACHER_ABSENCE -> R.string.notification_type_new_teacher_absence + Notification.TYPE_GENERAL -> R.string.notification_type_general + else -> R.string.notification_type_general + }) +} + +fun Cursor?.getString(columnName: String) = this?.getStringOrNull(getColumnIndex(columnName)) +fun Cursor?.getInt(columnName: String) = this?.getIntOrNull(getColumnIndex(columnName)) +fun Cursor?.getLong(columnName: String) = this?.getLongOrNull(getColumnIndex(columnName)) + +fun CharSequence.containsAll(list: List, ignoreCase: Boolean = false): Boolean { + for (i in list) { + if (!contains(i, ignoreCase)) + return false + } + return true +} + +inline fun RadioButton.setOnSelectedListener(crossinline listener: (buttonView: CompoundButton) -> Unit) + = setOnCheckedChangeListener { buttonView, isChecked -> if (isChecked) listener(buttonView) } + +fun Response.toErrorCode() = when (this.code()) { + 400 -> ERROR_REQUEST_HTTP_400 + 401 -> ERROR_REQUEST_HTTP_401 + 403 -> ERROR_REQUEST_HTTP_403 + 404 -> ERROR_REQUEST_HTTP_404 + 405 -> ERROR_REQUEST_HTTP_405 + 410 -> ERROR_REQUEST_HTTP_410 + 424 -> ERROR_REQUEST_HTTP_424 + 500 -> ERROR_REQUEST_HTTP_500 + 503 -> ERROR_REQUEST_HTTP_503 + else -> null +} +fun Throwable.toErrorCode() = when (this) { + is UnknownHostException -> ERROR_REQUEST_FAILURE_HOSTNAME_NOT_FOUND + is SSLException -> ERROR_REQUEST_FAILURE_SSL_ERROR + is SocketTimeoutException -> ERROR_REQUEST_FAILURE_TIMEOUT + is InterruptedIOException, is ConnectException -> ERROR_REQUEST_FAILURE_NO_INTERNET + is SzkolnyApiException -> this.error?.toErrorCode() + else -> null +} +fun ApiResponse.Error.toErrorCode() = when (this.code) { + "PdoError" -> ERROR_API_PDO_ERROR + "InvalidClient" -> ERROR_API_INVALID_CLIENT + "InvalidArgument" -> ERROR_API_INVALID_ARGUMENT + "InvalidSignature" -> ERROR_API_INVALID_SIGNATURE + "MissingScopes" -> ERROR_API_MISSING_SCOPES + "ResourceNotFound" -> ERROR_API_RESOURCE_NOT_FOUND + "InternalServerError" -> ERROR_API_INTERNAL_SERVER_ERROR + "PhpError" -> ERROR_API_PHP_E_ERROR + "PhpWarning" -> ERROR_API_PHP_E_WARNING + "PhpParse" -> ERROR_API_PHP_E_PARSE + "PhpNotice" -> ERROR_API_PHP_E_NOTICE + "PhpOther" -> ERROR_API_PHP_E_OTHER + "ApiMaintenance" -> ERROR_API_MAINTENANCE + "MissingArgument" -> ERROR_API_MISSING_ARGUMENT + "MissingPayload" -> ERROR_API_PAYLOAD_EMPTY + "InvalidAction" -> ERROR_API_INVALID_ACTION + "VersionNotFound" -> ERROR_API_UPDATE_NOT_FOUND + "InvalidDeviceIdUserCode" -> ERROR_API_INVALID_DEVICEID_USERCODE + "InvalidPairToken" -> ERROR_API_INVALID_PAIRTOKEN + "InvalidBrowserId" -> ERROR_API_INVALID_BROWSERID + "InvalidDeviceId" -> ERROR_API_INVALID_DEVICEID + "InvalidDeviceIdBrowserId" -> ERROR_API_INVALID_DEVICEID_BROWSERID + "HelpCategoryNotFound" -> ERROR_API_HELP_CATEGORY_NOT_FOUND + else -> ERROR_API_EXCEPTION +} +fun Throwable.toApiError(tag: String) = ApiError.fromThrowable(tag, this) + +inline fun ifNotNull(a: A?, b: B?, code: (A, B) -> R): R? { + if (a != null && b != null) { + return code(a, b) + } + return null +} + +@kotlin.jvm.JvmName("averageOrNullOfInt") +fun Iterable.averageOrNull() = this.average().let { if (it.isNaN()) null else it } +@kotlin.jvm.JvmName("averageOrNullOfFloat") +fun Iterable.averageOrNull() = this.average().let { if (it.isNaN()) null else it } + +fun String.copyToClipboard(context: Context) { + val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + val clipData = ClipData.newPlainText("Tekst", this) + clipboard.setPrimaryClip(clipData) +} + +fun TextView.getTextPosition(range: IntRange): Rect { + val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager + + // Initialize global value + var parentTextViewRect = Rect() + + // Initialize values for the computing of clickedText position + //val completeText = parentTextView.text as SpannableString + val textViewLayout = this.layout + + val startOffsetOfClickedText = range.first//completeText.getSpanStart(clickedText) + val endOffsetOfClickedText = range.last//completeText.getSpanEnd(clickedText) + var startXCoordinatesOfClickedText = textViewLayout.getPrimaryHorizontal(startOffsetOfClickedText) + var endXCoordinatesOfClickedText = textViewLayout.getPrimaryHorizontal(endOffsetOfClickedText) + + // Get the rectangle of the clicked text + val currentLineStartOffset = textViewLayout.getLineForOffset(startOffsetOfClickedText) + val currentLineEndOffset = textViewLayout.getLineForOffset(endOffsetOfClickedText) + val keywordIsInMultiLine = currentLineStartOffset != currentLineEndOffset + textViewLayout.getLineBounds(currentLineStartOffset, parentTextViewRect) + + // Update the rectangle position to his real position on screen + val parentTextViewLocation = intArrayOf(0, 0) + this.getLocationOnScreen(parentTextViewLocation) + + val parentTextViewTopAndBottomOffset = (parentTextViewLocation[1] - this.scrollY + this.compoundPaddingTop) + parentTextViewRect.top += parentTextViewTopAndBottomOffset + parentTextViewRect.bottom += parentTextViewTopAndBottomOffset + + // In the case of multi line text, we have to choose what rectangle take + if (keywordIsInMultiLine) { + val screenHeight = windowManager.defaultDisplay.height + val dyTop = parentTextViewRect.top + val dyBottom = screenHeight - parentTextViewRect.bottom + val onTop = dyTop > dyBottom + + if (onTop) { + endXCoordinatesOfClickedText = textViewLayout.getLineRight(currentLineStartOffset); + } else { + parentTextViewRect = Rect() + textViewLayout.getLineBounds(currentLineEndOffset, parentTextViewRect); + parentTextViewRect.top += parentTextViewTopAndBottomOffset; + parentTextViewRect.bottom += parentTextViewTopAndBottomOffset; + startXCoordinatesOfClickedText = textViewLayout.getLineLeft(currentLineEndOffset); + } + } + + parentTextViewRect.left += ( + parentTextViewLocation[0] + + startXCoordinatesOfClickedText + + this.compoundPaddingLeft - + this.scrollX + ).toInt() + parentTextViewRect.right = ( + parentTextViewRect.left + + endXCoordinatesOfClickedText - + startXCoordinatesOfClickedText + ).toInt() + + return parentTextViewRect +} + +inline fun ViewPager.addOnPageSelectedListener(crossinline block: (position: Int) -> Unit) = addOnPageChangeListener(object : ViewPager.OnPageChangeListener { + override fun onPageScrollStateChanged(state: Int) {} + override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {} + override fun onPageSelected(position: Int) { block(position) } +}) + +val SwipeRefreshLayout.onScrollListener: RecyclerView.OnScrollListener + get() = object : RecyclerView.OnScrollListener() { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { + if (recyclerView.canScrollVertically(-1)) + this@onScrollListener.isEnabled = false + if (!recyclerView.canScrollVertically(-1) && newState == RecyclerView.SCROLL_STATE_IDLE) + this@onScrollListener.isEnabled = true + } + } + +operator fun Iterable>.get(key: K): V? { + return firstOrNull { it.first == key }?.second +} + +fun ByteArray.toHexString() = joinToString("") { "%02x".format(it) } + +fun MutableList.after(what: E, insert: E) { + val index = indexOf(what) + if (index != -1) + add(index + 1, insert) +} + +fun MutableList.before(what: E, insert: E) { + val index = indexOf(what) + if (index != -1) + add(index, insert) +} + +fun MutableList.after(what: E, insert: Collection) { + val index = indexOf(what) + if (index != -1) + addAll(index + 1, insert) +} + +fun MutableList.before(what: E, insert: Collection) { + val index = indexOf(what) + if (index != -1) + addAll(index, insert) +} + +fun Context.getSyncInterval(interval: Int): String { + val hours = interval / 60 / 60 + val minutes = interval / 60 % 60 + val hoursText = if (hours > 0) + plural(R.plurals.time_till_hours, hours) + else + null + val minutesText = if (minutes > 0) + plural(R.plurals.time_till_minutes, minutes) + else + "" + return hoursText?.plus(" $minutesText") ?: minutesText +} + +fun Profile.getSchoolYearConstrains(): CalendarConstraints { + return CalendarConstraints.Builder() + .setStart(dateSemester1Start.inMillisUtc) + .setEnd(dateYearEnd.inMillisUtc) + .build() +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/GenericFileProvider.java b/app/src/main/java/pl/szczodrzynski/edziennik/GenericFileProvider.java deleted file mode 100644 index 69aef167..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/GenericFileProvider.java +++ /dev/null @@ -1,5 +0,0 @@ -package pl.szczodrzynski.edziennik; - -import androidx.core.content.FileProvider; - -public class GenericFileProvider extends FileProvider {} \ No newline at end of file diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt index e4d8ceae..b7540b44 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt @@ -1,6 +1,5 @@ package pl.szczodrzynski.edziennik -import android.app.Activity import android.app.ActivityManager import android.content.BroadcastReceiver import android.content.Context @@ -9,70 +8,85 @@ import android.content.IntentFilter import android.content.pm.PackageManager import android.graphics.BitmapFactory import android.graphics.drawable.BitmapDrawable -import android.os.* +import android.os.Build +import android.os.Bundle import android.provider.Settings -import android.util.Log import android.view.Gravity import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import androidx.appcompat.widget.PopupMenu import androidx.core.graphics.ColorUtils +import androidx.core.view.isVisible import androidx.lifecycle.Observer import androidx.navigation.NavOptions import com.danimahardhika.cafebar.CafeBar import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.mikepenz.iconics.IconicsColor +import com.jetradarmobile.snowfall.SnowfallView import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.IconicsSize import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial -import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont +import com.mikepenz.iconics.utils.colorInt +import com.mikepenz.iconics.utils.sizeDp import com.mikepenz.materialdrawer.model.DividerDrawerItem import com.mikepenz.materialdrawer.model.ProfileDrawerItem import com.mikepenz.materialdrawer.model.ProfileSettingDrawerItem -import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem -import com.mikepenz.materialdrawer.model.interfaces.IProfile +import com.mikepenz.materialdrawer.model.interfaces.* +import com.mikepenz.materialdrawer.model.utils.withIsHiddenInMiniDrawer +import eu.szkolny.font.SzkolnyFont +import kotlinx.coroutines.* import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import pl.droidsonroids.gif.GifDrawable -import pl.szczodrzynski.edziennik.App.APP_URL +import pl.szczodrzynski.edziennik.data.api.ERROR_API_INVALID_SIGNATURE +import pl.szczodrzynski.edziennik.data.api.ERROR_VULCAN_API_DEPRECATED +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask import pl.szczodrzynski.edziennik.data.api.events.* -import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing -import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.* +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi +import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus +import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Metadata.* +import pl.szczodrzynski.edziennik.data.db.entity.Profile import pl.szczodrzynski.edziennik.databinding.ActivitySzkolnyBinding -import pl.szczodrzynski.edziennik.network.ServerRequest import pl.szczodrzynski.edziennik.sync.AppManagerDetectedEvent import pl.szczodrzynski.edziennik.sync.SyncWorker +import pl.szczodrzynski.edziennik.sync.UpdateWorker +import pl.szczodrzynski.edziennik.ui.dialogs.RegisterUnavailableDialog +import pl.szczodrzynski.edziennik.ui.dialogs.ServerMessageDialog +import pl.szczodrzynski.edziennik.ui.dialogs.UpdateAvailableDialog import pl.szczodrzynski.edziennik.ui.dialogs.changelog.ChangelogDialog -import pl.szczodrzynski.edziennik.ui.dialogs.settings.ProfileRemoveDialog +import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog +import pl.szczodrzynski.edziennik.ui.dialogs.profile.ProfileConfigDialog import pl.szczodrzynski.edziennik.ui.dialogs.sync.SyncViewListDialog import pl.szczodrzynski.edziennik.ui.modules.agenda.AgendaFragment import pl.szczodrzynski.edziennik.ui.modules.announcements.AnnouncementsFragment import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceFragment -import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment +import pl.szczodrzynski.edziennik.ui.modules.base.MainSnackbar import pl.szczodrzynski.edziennik.ui.modules.behaviour.BehaviourFragment +import pl.szczodrzynski.edziennik.ui.modules.debug.DebugFragment +import pl.szczodrzynski.edziennik.ui.modules.debug.LabFragment +import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDetailsDialog import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar import pl.szczodrzynski.edziennik.ui.modules.feedback.FeedbackFragment -import pl.szczodrzynski.edziennik.ui.modules.feedback.HelpFragment -import pl.szczodrzynski.edziennik.ui.modules.grades.GradesFragment +import pl.szczodrzynski.edziennik.ui.modules.grades.GradesListFragment import pl.szczodrzynski.edziennik.ui.modules.grades.editor.GradesEditorFragment -import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragmentV2 +import pl.szczodrzynski.edziennik.ui.modules.home.HomeFragment import pl.szczodrzynski.edziennik.ui.modules.homework.HomeworkFragment import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity import pl.szczodrzynski.edziennik.ui.modules.messages.MessageFragment import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment -import pl.szczodrzynski.edziennik.ui.modules.notifications.NotificationsFragment +import pl.szczodrzynski.edziennik.ui.modules.messages.compose.MessagesComposeFragment +import pl.szczodrzynski.edziennik.ui.modules.notifications.NotificationsListFragment import pl.szczodrzynski.edziennik.ui.modules.settings.ProfileManagerFragment -import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsNewFragment -import pl.szczodrzynski.edziennik.ui.modules.timetable.v2.TimetableFragment -import pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoTouch -import pl.szczodrzynski.edziennik.utils.Themes -import pl.szczodrzynski.edziennik.utils.Utils +import pl.szczodrzynski.edziennik.ui.modules.settings.SettingsFragment +import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment +import pl.szczodrzynski.edziennik.ui.modules.webpush.WebPushFragment +import pl.szczodrzynski.edziennik.utils.* import pl.szczodrzynski.edziennik.utils.Utils.d import pl.szczodrzynski.edziennik.utils.Utils.dpToPx -import pl.szczodrzynski.edziennik.utils.appManagerIntentList +import pl.szczodrzynski.edziennik.utils.managers.AvailabilityManager +import pl.szczodrzynski.edziennik.utils.managers.AvailabilityManager.Error.Type import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.NavTarget import pl.szczodrzynski.navlib.* @@ -82,25 +96,23 @@ import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem import pl.szczodrzynski.navlib.drawer.NavDrawer import pl.szczodrzynski.navlib.drawer.items.DrawerPrimaryItem -import pl.szczodrzynski.navlib.drawer.items.withAppTitle -import java.io.File import java.io.IOException import java.util.* +import kotlin.coroutines.CoroutineContext import kotlin.math.roundToInt -class MainActivity : AppCompatActivity() { +class MainActivity : AppCompatActivity(), CoroutineScope { companion object { var useOldMessages = false const val TAG = "MainActivity" - const val REQUEST_LOGIN_ACTIVITY = 20222 - const val DRAWER_PROFILE_ADD_NEW = 200 const val DRAWER_PROFILE_SYNC_ALL = 201 const val DRAWER_PROFILE_EXPORT_DATA = 202 const val DRAWER_PROFILE_MANAGE = 203 + const val DRAWER_PROFILE_MARK_ALL_AS_READ = 204 const val DRAWER_ITEM_HOME = 1 const val DRAWER_ITEM_TIMETABLE = 11 const val DRAWER_ITEM_AGENDA = 12 @@ -115,9 +127,11 @@ class MainActivity : AppCompatActivity() { const val DRAWER_ITEM_DEBUG = 102 const val TARGET_GRADES_EDITOR = 501 - const val TARGET_HELP = 502 const val TARGET_FEEDBACK = 120 const val TARGET_MESSAGES_DETAILS = 503 + const val TARGET_MESSAGES_COMPOSE = 504 + const val TARGET_WEB_PUSH = 140 + const val TARGET_LAB = 1000 const val HOME_ID = DRAWER_ITEM_HOME @@ -125,7 +139,7 @@ class MainActivity : AppCompatActivity() { val list: MutableList = mutableListOf() // home item - list += NavTarget(DRAWER_ITEM_HOME, R.string.menu_home_page, HomeFragmentV2::class) + list += NavTarget(DRAWER_ITEM_HOME, R.string.menu_home_page, HomeFragment::class) .withTitle(R.string.app_name) .withIcon(CommunityMaterial.Icon2.cmd_home_outline) .isInDrawer(true) @@ -133,7 +147,7 @@ class MainActivity : AppCompatActivity() { .withPopToHome(false) list += NavTarget(DRAWER_ITEM_TIMETABLE, R.string.menu_timetable, TimetableFragment::class) - .withIcon(CommunityMaterial.Icon2.cmd_timetable) + .withIcon(CommunityMaterial.Icon3.cmd_timetable) .withBadgeTypeId(TYPE_LESSON_CHANGE) .isInDrawer(true) @@ -142,8 +156,8 @@ class MainActivity : AppCompatActivity() { .withBadgeTypeId(TYPE_EVENT) .isInDrawer(true) - list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesFragment::class) - .withIcon(CommunityMaterial.Icon2.cmd_numeric_5_box_outline) + list += NavTarget(DRAWER_ITEM_GRADES, R.string.menu_grades, GradesListFragment::class) + .withIcon(CommunityMaterial.Icon3.cmd_numeric_5_box_outline) .withBadgeTypeId(TYPE_GRADE) .isInDrawer(true) @@ -174,14 +188,14 @@ class MainActivity : AppCompatActivity() { // static drawer items - list += NavTarget(DRAWER_ITEM_NOTIFICATIONS, R.string.menu_notifications, NotificationsFragment::class) + list += NavTarget(DRAWER_ITEM_NOTIFICATIONS, R.string.menu_notifications, NotificationsListFragment::class) .withIcon(CommunityMaterial.Icon.cmd_bell_ring_outline) .isInDrawer(true) .isStatic(true) .isBelowSeparator(true) - list += NavTarget(DRAWER_ITEM_SETTINGS, R.string.menu_settings, SettingsNewFragment::class) - .withIcon(CommunityMaterial.Icon2.cmd_settings_outline) + list += NavTarget(DRAWER_ITEM_SETTINGS, R.string.menu_settings, SettingsFragment::class) + .withIcon(CommunityMaterial.Icon.cmd_cog_outline) .isInDrawer(true) .isStatic(true) .isBelowSeparator(true) @@ -189,7 +203,7 @@ class MainActivity : AppCompatActivity() { // profile settings items list += NavTarget(DRAWER_PROFILE_ADD_NEW, R.string.menu_add_new_profile, null) - .withIcon(CommunityMaterial.Icon2.cmd_plus) + .withIcon(CommunityMaterial.Icon3.cmd_plus) .withDescription(R.string.drawer_add_new_profile_desc) .isInProfileList(true) @@ -199,6 +213,10 @@ class MainActivity : AppCompatActivity() { .withDescription(R.string.drawer_manage_profiles_desc) .isInProfileList(false) + list += NavTarget(DRAWER_PROFILE_MARK_ALL_AS_READ, R.string.menu_mark_everything_as_read, null) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) + .isInProfileList(true) + list += NavTarget(DRAWER_PROFILE_SYNC_ALL, R.string.menu_sync_all, null) .withIcon(CommunityMaterial.Icon.cmd_download_outline) .isInProfileList(true) @@ -206,20 +224,34 @@ class MainActivity : AppCompatActivity() { // other target items, not directly navigated list += NavTarget(TARGET_GRADES_EDITOR, R.string.menu_grades_editor, GradesEditorFragment::class) - list += NavTarget(TARGET_HELP, R.string.menu_help, HelpFragment::class) list += NavTarget(TARGET_FEEDBACK, R.string.menu_feedback, FeedbackFragment::class) - list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessageFragment::class) - list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class) + list += NavTarget(TARGET_MESSAGES_DETAILS, R.string.menu_message, MessageFragment::class).withPopTo(DRAWER_ITEM_MESSAGES) + list += NavTarget(TARGET_MESSAGES_COMPOSE, R.string.menu_message_compose, MessagesComposeFragment::class) + list += NavTarget(TARGET_WEB_PUSH, R.string.menu_web_push, WebPushFragment::class) + if (App.devMode) { + list += NavTarget(DRAWER_ITEM_DEBUG, R.string.menu_debug, DebugFragment::class) + list += NavTarget(TARGET_LAB, R.string.menu_lab, LabFragment::class) + .withIcon(CommunityMaterial.Icon2.cmd_flask_outline) + .isInDrawer(true) + .isBelowSeparator(true) + .isStatic(true) + } list } } + private var job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + val b: ActivitySzkolnyBinding by lazy { ActivitySzkolnyBinding.inflate(layoutInflater) } val navView: NavView by lazy { b.navView } val drawer: NavDrawer by lazy { navView.drawer } val bottomSheet: NavBottomSheet by lazy { navView.bottomSheet } + val mainSnackbar: MainSnackbar by lazy { MainSnackbar(this) } val errorSnackbar: ErrorSnackbar by lazy { ErrorSnackbar(this) } + val requestHandler by lazy { MainActivityRequestHandler(this) } val swipeRefreshLayout: SwipeRefreshLayoutNoTouch by lazy { b.swipeRefreshLayout } @@ -229,10 +261,11 @@ class MainActivity : AppCompatActivity() { private val fragmentManager by lazy { supportFragmentManager } private lateinit var navTarget: NavTarget - private val navTargetId + private var navArguments: Bundle? = null + val navTargetId get() = navTarget.id - private val navBackStack = mutableListOf() + private val navBackStack = mutableListOf>() private var navLoading = true /* ____ _____ _ @@ -244,18 +277,35 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + d(TAG, "Activity created") + setTheme(Themes.appTheme) app.config.ui.language?.let { setLanguage(it) } + app.buildManager.validateBuild(this) + + if (App.profileId == 0) { + onProfileListEmptyEvent(ProfileListEmptyEvent()) + return + } + + d(TAG, "Profile is valid, inflating views") + setContentView(b.root) - Log.d(TAG, Signing.appPassword) - + mainSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar) errorSnackbar.setCoordinator(b.navView.coordinator, b.navView.bottomBar) + val versionBadge = app.buildManager.versionBadge + b.nightlyText.isVisible = versionBadge != null + b.nightlyText.text = versionBadge + if (versionBadge != null) { + b.nightlyText.background.setTintColor(0xa0ff0000.toInt()) + } + navLoading = true b.navView.apply { @@ -308,15 +358,17 @@ class MainActivity : AppCompatActivity() { removeAllItems() toggleGroupEnabled = false textInputEnabled = false + onCloseListener = { + if (!app.config.ui.bottomSheetOpened) + app.config.ui.bottomSheetOpened = true + } } drawer.apply { setAccountHeaderBackground(app.config.ui.headerBackground) drawerProfileListEmptyListener = { - app.config.loginFinished = false - app.saveConfig("loginFinished") - profileListEmptyListener() + onProfileListEmptyEvent(ProfileListEmptyEvent()) } drawerItemSelectedListener = { id, position, drawerItem -> loadTarget(id) @@ -327,8 +379,14 @@ class MainActivity : AppCompatActivity() { false } drawerProfileLongClickListener = { _, profile, _, view -> - if (profile is ProfileDrawerItem) { - showProfileContextMenu(profile, view) + if (view != null && profile is ProfileDrawerItem) { + launch { + val appProfile = withContext(Dispatchers.IO) { + App.db.profileDao().getByIdNow(profile.identifier.toInt()) + } ?: return@launch + drawer.close() + ProfileConfigDialog(this@MainActivity, appProfile) + } true } else { @@ -345,32 +403,32 @@ class MainActivity : AppCompatActivity() { navTarget = navTargetList[0] - var profileListEmpty = drawer.profileListEmpty - if (savedInstanceState != null) { intent?.putExtras(savedInstanceState) savedInstanceState.clear() } - if (!profileListEmpty) { - handleIntent(intent?.extras) - } - app.db.profileDao().allFull.observe(this, Observer { profiles -> - // TODO fix weird -1 profiles ??? - profiles.removeAll { it.id < 0 } - drawer.setProfileList(profiles) - if (profileListEmpty) { - profileListEmpty = false - handleIntent(intent?.extras) - } - else if (app.profile != null) { - drawer.currentProfile = app.profile.id + app.db.profileDao().all.observe(this, Observer { profiles -> + val allArchived = profiles.all { it.archived } + drawer.setProfileList(profiles.filter { it.id >= 0 && (!it.archived || allArchived) }.toMutableList()) + //prepend the archived profile if loaded + if (app.profile.archived && !allArchived) { + drawer.prependProfile(Profile( + id = app.profile.id, + loginStoreId = app.profile.loginStoreId, + loginStoreType = app.profile.loginStoreType, + name = app.profile.name, + subname = "Archiwum - ${app.profile.subname}" + ).also { + it.archived = true + }) } + drawer.currentProfile = App.profileId }) - // if null, getAllFull will load a profile and update drawerItems - if (app.profile != null) - setDrawerItems() + setDrawerItems() + + handleIntent(intent?.extras) app.db.metadataDao().unreadCounts.observe(this, Observer { unreadCounters -> unreadCounters.map { @@ -380,59 +438,59 @@ class MainActivity : AppCompatActivity() { }) b.swipeRefreshLayout.isEnabled = true - b.swipeRefreshLayout.setOnRefreshListener { this.syncCurrentFeature() } + b.swipeRefreshLayout.setOnRefreshListener { launch { syncCurrentFeature() } } b.swipeRefreshLayout.setColorSchemeResources( R.color.md_blue_500, R.color.md_amber_500, R.color.md_green_500 ) - isStoragePermissionGranted() - SyncWorker.scheduleNext(app) + UpdateWorker.scheduleNext(app) - // APP BACKGROUND - if (app.config.ui.appBackground != null) { - try { - app.config.ui.appBackground?.let { - var bg = it - val bgDir = File(Environment.getExternalStoragePublicDirectory("Szkolny.eu"), "bg") - if (bgDir.exists()) { - val files = bgDir.listFiles() - val r = Random() - val i = r.nextInt(files.size) - bg = files[i].toString() - } - val linearLayout = b.root - if (bg.endsWith(".gif")) { - linearLayout.background = GifDrawable(bg) - } else { - linearLayout.background = BitmapDrawable.createFromPath(bg) + // if loaded profile is archived, switch to the up-to-date version of it + if (app.profile.archived) { + launch { + if (app.profile.archiveId != null) { + val profile = withContext(Dispatchers.IO) { + app.db.profileDao().getNotArchivedOf(app.profile.archiveId!!) } + if (profile != null) + loadProfile(profile) + else + loadProfile(0) + } else { + loadProfile(0) } - } catch (e: IOException) { - e.printStackTrace() } } + // APP BACKGROUND + setAppBackground() + // IT'S WINTER MY DUDES val today = Date.getToday() - if ((today.month == 12 || today.month == 1) && app.config.ui.snowfall) { + if ((today.month % 11 == 1) && app.config.ui.snowfall) { b.rootFrame.addView(layoutInflater.inflate(R.layout.snowfall, b.rootFrame, false)) } + else if (app.config.ui.eggfall && BigNightUtil().isDataWielkanocyNearDzisiaj()) { + val eggfall = layoutInflater.inflate(R.layout.eggfall, b.rootFrame, false) as SnowfallView + eggfall.setSnowflakeBitmaps(listOf( + BitmapFactory.decodeResource(resources, R.drawable.egg1), + BitmapFactory.decodeResource(resources, R.drawable.egg2), + BitmapFactory.decodeResource(resources, R.drawable.egg3), + BitmapFactory.decodeResource(resources, R.drawable.egg4), + BitmapFactory.decodeResource(resources, R.drawable.egg5), + BitmapFactory.decodeResource(resources, R.drawable.egg6) + )) + b.rootFrame.addView(eggfall) + } // WHAT'S NEW DIALOG if (app.config.appVersion < BuildConfig.VERSION_CODE) { - ServerRequest(app, app.requestScheme + APP_URL + "main.php?just_updated", "MainActivity/JU") - .run { e, result -> - Handler(Looper.getMainLooper()).post { - try { - ChangelogDialog().show(supportFragmentManager, "whats_new") - } catch (e2: Exception) { - e2.printStackTrace() - } - } - } + // force an AppSync after update + app.config.sync.lastAppSync = 0L + ChangelogDialog(this) if (app.config.appVersion < 170) { //Intent intent = new Intent(this, ChangelogIntroActivity.class); //startActivity(intent); @@ -446,7 +504,11 @@ class MainActivity : AppCompatActivity() { navView.coordinator.postDelayed({ CafeBar.builder(this) .content(R.string.rate_snackbar_text) - .icon(IconicsDrawable(this).icon(CommunityMaterial.Icon2.cmd_star_outline).size(IconicsSize.dp(20)).color(IconicsColor.colorInt(Themes.getPrimaryTextColor(this)))) + .icon(IconicsDrawable(this).apply { + icon = CommunityMaterial.Icon3.cmd_star_outline + sizeDp = 24 + colorInt = Themes.getPrimaryTextColor(this@MainActivity) + }) .positiveText(R.string.rate_snackbar_positive) .positiveColor(-0xb350b0) .negativeText(R.string.rate_snackbar_negative) @@ -459,12 +521,12 @@ class MainActivity : AppCompatActivity() { app.config.appRateSnackbarTime = 0 } .onNegative { cafeBar -> - Toast.makeText(this, "Szkoda, opinie innych pomagają mi rozwijać aplikację.", Toast.LENGTH_LONG).show() + Toast.makeText(this, R.string.rate_snackbar_negative_message, Toast.LENGTH_LONG).show() cafeBar.dismiss() app.config.appRateSnackbarTime = 0 } .onNeutral { cafeBar -> - Toast.makeText(this, "OK", Toast.LENGTH_LONG).show() + Toast.makeText(this, R.string.ok, Toast.LENGTH_LONG).show() cafeBar.dismiss() app.config.appRateSnackbarTime = System.currentTimeMillis() + 7 * 24 * 60 * 60 * 1000 } @@ -488,7 +550,7 @@ class MainActivity : AppCompatActivity() { BottomSheetSeparatorItem(false), BottomSheetPrimaryItem(false) .withTitle(R.string.menu_settings) - .withIcon(CommunityMaterial.Icon2.cmd_settings_outline) + .withIcon(CommunityMaterial.Icon.cmd_cog_outline) .withOnClickListener(View.OnClickListener { loadTarget(DRAWER_ITEM_SETTINGS) }), BottomSheetPrimaryItem(false) .withTitle(R.string.menu_feedback) @@ -498,32 +560,30 @@ class MainActivity : AppCompatActivity() { if (App.devMode) { bottomSheet += BottomSheetPrimaryItem(false) .withTitle(R.string.menu_debug) - .withIcon(CommunityMaterial.Icon.cmd_android_studio) + .withIcon(CommunityMaterial.Icon.cmd_android_debug_bridge) .withOnClickListener(View.OnClickListener { loadTarget(DRAWER_ITEM_DEBUG) }) } - - EventBus.getDefault().register(this) } - override fun onDestroy() { - EventBus.getDefault().unregister(this) - super.onDestroy() - } - - var profileListEmptyListener = { - startActivityForResult(Intent(this, LoginActivity::class.java), REQUEST_LOGIN_ACTIVITY) - } private var profileSettingClickListener = { id: Int, view: View? -> when (id) { DRAWER_PROFILE_ADD_NEW -> { - LoginActivity.privacyPolicyAccepted = true - // else it would try to navigateUp onBackPressed, which it can't do. There is no parent fragment - LoginActivity.firstCompleted = false - profileListEmptyListener() + requestHandler.requestLogin() } DRAWER_PROFILE_SYNC_ALL -> { EdziennikTask.sync().enqueue(this) } + DRAWER_PROFILE_MARK_ALL_AS_READ -> { launch { + withContext(Dispatchers.Default) { + app.db.profileDao().allNow.forEach { profile -> + if (profile.loginStoreType != LoginStore.LOGIN_TYPE_LIBRUS) + app.db.metadataDao().setAllSeenExceptMessagesAndAnnouncements(profile.id, true) + else + app.db.metadataDao().setAllSeenExceptMessages(profile.id, true) + } + } + Toast.makeText(this@MainActivity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show() + }} else -> { loadTarget(id) } @@ -539,7 +599,62 @@ class MainActivity : AppCompatActivity() { |_____/ \__, |_| |_|\___| __/ | |__*/ - fun syncCurrentFeature() { + suspend fun syncCurrentFeature() { + if (app.profile.archived) { + MaterialAlertDialogBuilder(this) + .setTitle(R.string.profile_archived_title) + .setMessage( + R.string.profile_archived_text, + app.profile.studentSchoolYearStart, + app.profile.studentSchoolYearStart + 1 + ) + .setPositiveButton(R.string.ok, null) + .show() + swipeRefreshLayout.isRefreshing = false + return + } + if (app.profile.shouldArchive()) { + MaterialAlertDialogBuilder(this) + .setTitle(R.string.profile_archiving_title) + .setMessage( + R.string.profile_archiving_format, + app.profile.dateYearEnd.formattedString + ) + .setPositiveButton(R.string.ok, null) + .show() + } + if (app.profile.isBeforeYear()) { + MaterialAlertDialogBuilder(this) + .setTitle(R.string.profile_year_not_started_title) + .setMessage( + R.string.profile_year_not_started_format, + app.profile.dateSemester1Start.formattedString + ) + .setPositiveButton(R.string.ok, null) + .show() + swipeRefreshLayout.isRefreshing = false + return + } + + val error = withContext(Dispatchers.IO) { + app.availabilityManager.check(app.profile) + } + when (error?.type) { + Type.NOT_AVAILABLE -> { + swipeRefreshLayout.isRefreshing = false + loadTarget(DRAWER_ITEM_HOME) + RegisterUnavailableDialog(this, error.status!!) + return + } + Type.API_ERROR -> { + errorSnackbar.addError(error.apiError!!).show() + return + } + Type.NO_API_ACCESS -> { + Toast.makeText(this, R.string.error_no_api_access, Toast.LENGTH_SHORT).show() + } + } + swipeRefreshLayout.isRefreshing = true Toast.makeText(this, fragmentToSyncName(navTargetId), Toast.LENGTH_SHORT).show() val fragmentParam = when (navTargetId) { @@ -553,11 +668,24 @@ class MainActivity : AppCompatActivity() { EdziennikTask.syncProfile( App.profileId, listOf(navTargetId to fragmentParam), - arguments + arguments = arguments ).enqueue(this) } + @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) + fun onUpdateEvent(event: Update) { + EventBus.getDefault().removeStickyEvent(event) + UpdateAvailableDialog(this, event) + } + @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) + fun onRegisterAvailabilityEvent(event: RegisterAvailabilityEvent) { + EventBus.getDefault().removeStickyEvent(event) + val error = app.availabilityManager.check(app.profile, cacheOnly = true) + if (error != null) { + RegisterUnavailableDialog(this, error.status!!) + } + } @Subscribe(threadMode = ThreadMode.MAIN) - fun onSyncStartedEvent(event: ApiTaskStartedEvent) { + fun onApiTaskStartedEvent(event: ApiTaskStartedEvent) { swipeRefreshLayout.isRefreshing = true if (event.profileId == App.profileId) { navView.toolbar.apply { @@ -568,7 +696,14 @@ class MainActivity : AppCompatActivity() { } } @Subscribe(threadMode = ThreadMode.MAIN) - fun onSyncProgressEvent(event: ApiTaskProgressEvent) { + fun onProfileListEmptyEvent(event: ProfileListEmptyEvent) { + d(TAG, "Profile list is empty. Launch LoginActivity.") + app.config.loginFinished = false + startActivity(Intent(this, LoginActivity::class.java)) + finish() + } + @Subscribe(threadMode = ThreadMode.MAIN) + fun onApiTaskProgressEvent(event: ApiTaskProgressEvent) { if (event.profileId == App.profileId) { navView.toolbar.apply { subtitleFormat = null @@ -581,8 +716,9 @@ class MainActivity : AppCompatActivity() { } } } - @Subscribe(threadMode = ThreadMode.MAIN) - fun onSyncProfileFinishedEvent(event: ApiTaskFinishedEvent) { + @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) + fun onApiTaskFinishedEvent(event: ApiTaskFinishedEvent) { + EventBus.getDefault().removeStickyEvent(event) if (event.profileId == App.profileId) { navView.toolbar.apply { subtitleFormat = R.string.toolbar_subtitle @@ -591,22 +727,31 @@ class MainActivity : AppCompatActivity() { } } } - @Subscribe(threadMode = ThreadMode.MAIN) - fun onSyncFinishedEvent(event: ApiTaskAllFinishedEvent) { + @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) + fun onApiTaskAllFinishedEvent(event: ApiTaskAllFinishedEvent) { + EventBus.getDefault().removeStickyEvent(event) swipeRefreshLayout.isRefreshing = false } - @Subscribe(threadMode = ThreadMode.MAIN) - fun onSyncErrorEvent(event: ApiTaskErrorEvent) { + @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) + fun onApiTaskErrorEvent(event: ApiTaskErrorEvent) { + EventBus.getDefault().removeStickyEvent(event) + if (event.error.errorCode == ERROR_VULCAN_API_DEPRECATED) { + if (event.error.profileId != App.profileId) + return + ErrorDetailsDialog(this, listOf(event.error)) + } navView.toolbar.apply { subtitleFormat = R.string.toolbar_subtitle subtitleFormatWithUnread = R.plurals.toolbar_subtitle_with_unread subtitle = "Gotowe" } + mainSnackbar.dismiss() errorSnackbar.addError(event.error).show() } @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) fun onAppManagerDetectedEvent(event: AppManagerDetectedEvent) { - if (app.appConfig.dontShowAppManagerDialog) + EventBus.getDefault().removeStickyEvent(event) + if (app.config.sync.dontShowAppManagerDialog) return MaterialAlertDialogBuilder(this) .setTitle(R.string.app_manager_dialog_title) @@ -628,12 +773,15 @@ class MainActivity : AppCompatActivity() { } } .setNeutralButton(R.string.dont_ask_again) { dialog, which -> - app.appConfig.dontShowAppManagerDialog = true - app.saveConfig("dontShowAppManagerDialog") + app.config.sync.dontShowAppManagerDialog = true } .setCancelable(false) .show() } + @Subscribe(threadMode = ThreadMode.MAIN) + fun onUserActionRequiredEvent(event: UserActionRequiredEvent) { + app.userActionManager.execute(this, event.profileId, event.type) + } private fun fragmentToSyncName(currentFragment: Int): Int { return when (currentFragment) { @@ -663,7 +811,7 @@ class MainActivity : AppCompatActivity() { handleIntent(intent?.extras) } } - private fun handleIntent(extras: Bundle?) { + fun handleIntent(extras: Bundle?) { d(TAG, "handleIntent() {") extras?.keySet()?.forEach { key -> @@ -671,26 +819,64 @@ class MainActivity : AppCompatActivity() { } d(TAG, "}") + var intentProfileId = -1 + var intentTargetId = -1 + + if (extras?.containsKey("action") == true) { + val handled = when (extras.getString("action")) { + "serverMessage" -> { + ServerMessageDialog( + this, + extras.getString("serverMessageTitle") ?: getString(R.string.app_name), + extras.getString("serverMessageText") ?: "" + ) + true + } + "feedbackMessage" -> { + intentTargetId = TARGET_FEEDBACK + false + } + "userActionRequired" -> { + app.userActionManager.execute( + this, + extras.getInt("profileId"), + extras.getInt("type") + ) + true + } + "createManualEvent" -> { + val date = extras.getString("eventDate")?.let { Date.fromY_m_d(it) } ?: Date.getToday() + EventManualDialog( + this, + App.profileId, + defaultDate = date + ) + true + } + else -> false + } + if (handled && !navLoading) { + return + } + } + if (extras?.containsKey("reloadProfileId") == true) { val reloadProfileId = extras.getInt("reloadProfileId", -1) extras.remove("reloadProfileId") - if (reloadProfileId == -1 || (app.profile != null && app.profile.id == reloadProfileId)) { + if (reloadProfileId == -1 || app.profile.id == reloadProfileId) { reloadTarget() return } } - var intentProfileId = -1 - var intentTargetId = -1 - - if (extras?.containsKey("profileId") == true) { + if (extras?.getInt("profileId", -1) != -1) { intentProfileId = extras.getInt("profileId", -1) - extras.remove("profileId") + extras?.remove("profileId") } - if (extras?.containsKey("fragmentId") == true) { + if (extras?.getInt("fragmentId", -1) != -1) { intentTargetId = extras.getInt("fragmentId", -1) - extras.remove("fragmentId") + extras?.remove("fragmentId") } /*if (intentTargetId == -1 && navController.currentDestination?.id == R.id.loadingFragment) { @@ -704,9 +890,9 @@ class MainActivity : AppCompatActivity() { } when { - app.profile == null || app.profile.id == -1 -> { + app.profile.id == 0 -> { if (intentProfileId == -1) - intentProfileId = app.appSharedPrefs.getInt("current_profile_id", 1) + intentProfileId = app.config.lastProfileId loadProfile(intentProfileId, intentTargetId, extras) } intentProfileId != -1 -> { @@ -745,16 +931,32 @@ class MainActivity : AppCompatActivity() { startActivity(intent) } + override fun onStart() { + d(TAG, "Activity started") + super.onStart() + } + override fun onStop() { + d(TAG, "Activity stopped") + super.onStop() + } override fun onResume() { + d(TAG, "Activity resumed") val filter = IntentFilter() filter.addAction(Intent.ACTION_MAIN) registerReceiver(intentReceiver, filter) + EventBus.getDefault().register(this) super.onResume() } override fun onPause() { + d(TAG, "Activity paused") unregisterReceiver(intentReceiver) + EventBus.getDefault().unregister(this) super.onPause() } + override fun onDestroy() { + d(TAG, "Activity destroyed") + super.onDestroy() + } override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) @@ -767,18 +969,7 @@ class MainActivity : AppCompatActivity() { } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) - if (requestCode == REQUEST_LOGIN_ACTIVITY) { - if (resultCode == Activity.RESULT_CANCELED && false) { - finish() - } - else { - if (!app.config.loginFinished) - finish() - else { - handleIntent(data?.extras) - } - } - } + requestHandler.handleResult(requestCode, resultCode, data) } /* _ _ _ _ _ @@ -796,41 +987,58 @@ class MainActivity : AppCompatActivity() { fun loadProfile(id: Int) = loadProfile(id, navTargetId) fun loadProfile(id: Int, arguments: Bundle?) = loadProfile(id, navTargetId, arguments) - fun loadProfile(id: Int, drawerSelection: Int, arguments: Bundle? = null) { - //d("NavDebug", "loadProfile(id = $id, drawerSelection = $drawerSelection)") - if (app.profile != null && App.profileId == id) { + fun loadProfile(profile: Profile) = loadProfile( + profile, + navTargetId, + null, + if (app.profile.archived) app.profile.id else null + ) + private fun loadProfile(id: Int, drawerSelection: Int, arguments: Bundle? = null) { + if (App.profileId == id) { drawer.currentProfile = app.profile.id loadTarget(drawerSelection, arguments) return } - AsyncTask.execute { - app.profileLoadById(id) - - this.runOnUiThread { - if (app.profile == null) { - LoginActivity.firstCompleted = false - if (app.config.loginFinished) { - // this shouldn't run - profileListEmptyListener() - } - } else { - setDrawerItems() - // the drawer profile is updated automatically when the drawer item is clicked - // update it manually when switching profiles from other source - //if (drawer.currentProfile != app.profile.id) - drawer.currentProfile = app.profile.id - loadTarget(drawerSelection, arguments) - } - } + val previousArchivedId = if (app.profile.archived) app.profile.id else null + app.profileLoad(id) { + loadProfile(it, drawerSelection, arguments, previousArchivedId) } } + private fun loadProfile(profile: Profile, drawerSelection: Int, arguments: Bundle?, previousArchivedId: Int?) { + App.profile = profile + MessagesFragment.pageSelection = -1 + + setDrawerItems() + + if (previousArchivedId != null) { + // prevents accidentally removing the first item if the archived profile is not shown + drawer.removeProfileById(previousArchivedId) + } + if (profile.archived) { + drawer.prependProfile(Profile( + id = profile.id, + loginStoreId = profile.loginStoreId, + loginStoreType = profile.loginStoreType, + name = profile.name, + subname = "Archiwum - ${profile.subname}" + ).also { + it.archived = true + }) + } + + // the drawer profile is updated automatically when the drawer item is clicked + // update it manually when switching profiles from other source + //if (drawer.currentProfile != app.profile.id) + drawer.currentProfile = app.profileId + loadTarget(drawerSelection, arguments) + } fun loadTarget(id: Int, arguments: Bundle? = null) { var loadId = id if (loadId == -1) { loadId = DRAWER_ITEM_HOME } val target = navTargetList - .singleOrNull { it.id == loadId } + .firstOrNull { it.id == loadId } if (target == null) { Toast.makeText(this, getString(R.string.error_invalid_fragment, id), Toast.LENGTH_LONG).show() loadTarget(navTargetList.first(), arguments) @@ -839,15 +1047,16 @@ class MainActivity : AppCompatActivity() { loadTarget(target, arguments) } } - private fun loadTarget(target: NavTarget, arguments: Bundle? = null) { - d("NavDebug", "loadItem(id = ${target.id})") + private fun loadTarget(target: NavTarget, args: Bundle? = null) { + d("NavDebug", "loadTarget(target = $target, args = $args)") + val arguments = args ?: navBackStack.firstOrNull { it.first.id == target.id }?.second ?: Bundle() bottomSheet.close() bottomSheet.removeAllContextual() bottomSheet.toggleGroupEnabled = false - bottomSheet.onCloseListener = null drawer.close() - drawer.setSelection(target.id, fireOnClick = false) + if (drawer.getSelection() != target.id) + drawer.setSelection(target.id, fireOnClick = false) navView.toolbar.setTitle(target.title ?: target.name) navView.bottomBar.fabEnable = false navView.bottomBar.fabExtended = false @@ -867,7 +1076,7 @@ class MainActivity : AppCompatActivity() { ) } else { - navBackStack.lastIndexOf(target).let { + navBackStack.keys().lastIndexOf(target).let { if (it == -1) return@let target // pop the back stack up until that target @@ -889,6 +1098,7 @@ class MainActivity : AppCompatActivity() { navBackStack.removeAt(navBackStack.lastIndex) } navTarget = target + navArguments = arguments return@let null }?.let { @@ -898,8 +1108,9 @@ class MainActivity : AppCompatActivity() { R.anim.task_open_enter, R.anim.task_open_exit ) - navBackStack.add(navTarget) + navBackStack.add(navTarget to navArguments) navTarget = target + navArguments = arguments } } @@ -914,7 +1125,7 @@ class MainActivity : AppCompatActivity() { d("NavDebug", "Current fragment ${navTarget.fragmentClass?.java?.simpleName}, pop to home ${navTarget.popToHome}, back stack:") navBackStack.forEachIndexed { index, target2 -> - d("NavDebug", " - $index: ${target2.fragmentClass?.java?.simpleName}") + d("NavDebug", " - $index: ${target2.first.fragmentClass?.java?.simpleName}") } transaction.replace(R.id.fragment, fragment) @@ -939,11 +1150,18 @@ class MainActivity : AppCompatActivity() { return false } // TODO back stack argument support - if (navTarget.popToHome) { - loadTarget(HOME_ID) - } - else { - loadTarget(navBackStack.last()) + when { + navTarget.popToHome -> { + loadTarget(HOME_ID) + } + navTarget.popTo != null -> { + loadTarget(navTarget.popTo ?: HOME_ID) + } + else -> { + navBackStack.last().let { + loadTarget(it.first, it.second) + } + } } return true } @@ -958,6 +1176,8 @@ class MainActivity : AppCompatActivity() { * that something has changed in the bottom sheet. */ fun gainAttention() { + if (app.config.ui.bottomSheetOpened) + return b.navView.postDelayed({ navView.gainAttentionOnBottomBar() }, 2000) @@ -975,6 +1195,19 @@ class MainActivity : AppCompatActivity() { }, 3000) } + fun setAppBackground() { + try { + b.root.background = app.config.ui.appBackground?.let { + if (it.endsWith(".gif")) + GifDrawable(it) + else + BitmapDrawable.createFromPath(it) + } + } catch (e: IOException) { + e.printStackTrace() + } + } + /* _____ _ _ | __ \ (_) | | | | |_ __ __ ___ _____ _ __ _| |_ ___ _ __ ___ ___ @@ -985,11 +1218,12 @@ class MainActivity : AppCompatActivity() { val item = DrawerPrimaryItem() .withIdentifier(target.id.toLong()) .withName(target.name) - .withHiddenInMiniDrawer(!app.config.ui.miniMenuButtons.contains(target.id)) + .withIsHiddenInMiniDrawer(!app.config.ui.miniMenuButtons.contains(target.id)) .also { if (target.description != null) it.withDescription(target.description!!) } .also { if (target.icon != null) it.withIcon(target.icon!!) } .also { if (target.title != null) it.withAppTitle(getString(target.title!!)) } .also { if (target.badgeTypeId != null) it.withBadgeStyle(drawer.badgeStyle)} + .withSelectedBackgroundAnimated(false) if (target.badgeTypeId != null) drawer.addUnreadCounterType(target.badgeTypeId!!, target.id) @@ -1005,12 +1239,11 @@ class MainActivity : AppCompatActivity() { } fun setDrawerItems() { - d("NavDebug", "setDrawerItems() app.profile = ${app.profile ?: "null"}") + d("NavDebug", "setDrawerItems() app.profile = ${app.profile}") val drawerItems = arrayListOf>() val drawerProfiles = arrayListOf() - val supportedFragments = if (app.profile == null) arrayListOf() - else app.profile.supportedFragments + val supportedFragments = app.profile.supportedFragments targetPopToHomeList.clear() @@ -1050,35 +1283,20 @@ class MainActivity : AppCompatActivity() { drawer.addProfileSettings(*drawerProfiles.toTypedArray()) } - private fun showProfileContextMenu(profile: IProfile<*>, view: View) { - val profileId = profile.identifier.toInt() - val popupMenu = PopupMenu(this, view) - popupMenu.menu.add(0, 1, 1, R.string.profile_menu_open_settings) - popupMenu.menu.add(0, 2, 2, R.string.profile_menu_remove) - popupMenu.setOnMenuItemClickListener { item -> - if (item.itemId == 1) { - if (profileId != app.profile.id) { - loadProfile(profileId, DRAWER_ITEM_SETTINGS) - return@setOnMenuItemClickListener true - } - loadTarget(DRAWER_ITEM_SETTINGS, null) - } else if (item.itemId == 2) { - ProfileRemoveDialog(this, profileId, profile.name?.getText(this)?.toString() ?: "?") - } - true - } - popupMenu.show() - } - private val targetPopToHomeList = arrayListOf() private var targetHomeId: Int = -1 override fun onBackPressed() { if (!b.navView.onBackPressed()) { - if (App.getConfig().ui.openDrawerOnBackPressed) { + if (App.config.ui.openDrawerOnBackPressed && ((navTarget.popTo == null && navTarget.popToHome) + || navTarget.id == DRAWER_ITEM_HOME)) { b.navView.drawer.toggle() } else { navigateUp() } } } + + fun error(error: ApiError) = errorSnackbar.addError(error).show() + fun snackbar(text: String, actionText: String? = null, onClick: (() -> Unit)? = null) = mainSnackbar.snackbar(text, actionText, onClick) + fun snackbarDismiss() = mainSnackbar.dismiss() } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivityRequestHandler.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivityRequestHandler.kt new file mode 100644 index 00000000..a39a5872 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivityRequestHandler.kt @@ -0,0 +1,220 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-23. + */ + +package pl.szczodrzynski.edziennik + +import android.app.Activity +import android.content.Intent +import android.net.Uri +import android.provider.OpenableColumns +import com.canhub.cropper.CropImage +import com.canhub.cropper.CropImageView +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.ui.modules.login.LoginActivity +import java.io.File +import java.io.FileOutputStream + +class MainActivityRequestHandler(val activity: MainActivity) { + companion object { + private const val REQUEST_LOGIN_ACTIVITY = 2000 + private const val REQUEST_FILE_HEADER_BACKGROUND = 3000 + private const val REQUEST_FILE_APP_BACKGROUND = 4000 + private const val REQUEST_FILE_PROFILE_IMAGE = 5000 + private const val REQUEST_CROP_HEADER_BACKGROUND = 3100 + private const val REQUEST_CROP_APP_BACKGROUND = 4100 + private const val REQUEST_CROP_PROFILE_IMAGE = 5100 + } + + private val app = activity.app + private val requestData = mutableMapOf() + private val listeners = mutableMapOf Unit>() + + private val manager + get() = app.permissionManager + + fun requestLogin() = activity.startActivityForResult( + Intent(activity, LoginActivity::class.java), + REQUEST_LOGIN_ACTIVITY + ) + + fun requestHeaderBackground(listener: (Any?) -> Unit) = + manager.requestCameraPermission( + activity, 0, isRequired = false + ) { + listeners[REQUEST_FILE_HEADER_BACKGROUND] = listener + activity.startActivityForResult( + CropImage.getPickImageChooserIntent( + activity, + activity.getString(R.string.pick_image_intent_chooser_title), + true, + true + ), + REQUEST_FILE_HEADER_BACKGROUND + ) + } + + fun requestAppBackground(listener: (Any?) -> Unit) = + manager.requestCameraPermission( + activity, 0, isRequired = false + ) { + listeners[REQUEST_FILE_APP_BACKGROUND] = listener + activity.startActivityForResult( + CropImage.getPickImageChooserIntent( + activity, + activity.getString(R.string.pick_image_intent_chooser_title), + true, + true + ), + REQUEST_FILE_APP_BACKGROUND + ) + } + + fun requestProfileImage(profile: Profile, listener: (Any?) -> Unit) = + manager.requestCameraPermission( + activity, 0, isRequired = false + ) { + listeners[REQUEST_FILE_PROFILE_IMAGE] = listener + requestData[REQUEST_FILE_PROFILE_IMAGE] = profile + activity.startActivityForResult( + CropImage.getPickImageChooserIntent( + activity, + activity.getString(R.string.pick_image_intent_chooser_title), + true, + true + ), + REQUEST_FILE_PROFILE_IMAGE + ) + } + + private fun getFileInfo(uri: Uri): Pair { + if (uri.scheme == "file") { + return (uri.lastPathSegment ?: "unknown") to null + } + val cursor = activity.contentResolver.query( + uri, + null, + null, + null, + null, + null + ) + + return cursor?.use { + if (it.moveToFirst()) { + val name = it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME)) + val mimeIndex = it.getColumnIndex("mime_type") + val mimeType = if (mimeIndex != -1) it.getString(mimeIndex) else null + + name to mimeType + } else + null + } ?: "unknown" to null + } + + private fun shouldCrop(uri: Uri): Boolean { + val (filename, mimeType) = getFileInfo(uri) + return !filename.endsWith(".gif") && mimeType?.endsWith("/gif") != true + } + + private fun saveFile(uri: Uri, name: String): String { + val (filename, _) = getFileInfo(uri) + val extension = filename.substringAfterLast('.') + val file = File(activity.filesDir, "$name.$extension") + activity.contentResolver.openInputStream(uri)?.use { input -> + FileOutputStream(file).use { output -> + input.copyTo(output) + } + } + return file.absolutePath + } + + fun handleResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (resultCode != Activity.RESULT_OK) + return + var uri = CropImage.getPickImageResultUri(activity, data) + when (requestCode) { + REQUEST_LOGIN_ACTIVITY -> { + if (!app.config.loginFinished) + activity.finish() + else { + activity.handleIntent(data?.extras) + } + } + REQUEST_FILE_HEADER_BACKGROUND -> { + if (uri == null) + return // TODO: 2021-03-24 if the app returns no data + if (shouldCrop(uri)) { + val intent = CropImage.activity(uri) + .setAspectRatio(512, 288) + .setGuidelines(CropImageView.Guidelines.ON_TOUCH) + .setAllowFlipping(true) + .setAllowRotation(true) + .setRequestedSize(512, 288) + .getIntent(activity) + activity.startActivityForResult(intent, REQUEST_CROP_HEADER_BACKGROUND) + } else { + val path = saveFile(uri, "header") + app.config.ui.headerBackground = path + listeners.remove(REQUEST_FILE_HEADER_BACKGROUND)?.invoke(path) + } + } + REQUEST_FILE_APP_BACKGROUND -> { + if (uri == null) + return + if (shouldCrop(uri)) { + val intent = CropImage.activity(uri) + .setGuidelines(CropImageView.Guidelines.ON_TOUCH) + .setAllowFlipping(true) + .setAllowRotation(true) + .getIntent(activity) + activity.startActivityForResult(intent, REQUEST_CROP_APP_BACKGROUND) + } else { + val path = saveFile(uri, "background") + app.config.ui.appBackground = path + listeners.remove(REQUEST_FILE_APP_BACKGROUND)?.invoke(path) + } + } + REQUEST_FILE_PROFILE_IMAGE -> { + if (uri == null) + return + if (shouldCrop(uri)) { + val intent = CropImage.activity(uri) + .setAspectRatio(1, 1) + .setCropShape(CropImageView.CropShape.OVAL) + .setGuidelines(CropImageView.Guidelines.ON_TOUCH) + .setAllowFlipping(true) + .setAllowRotation(true) + .setRequestedSize(512, 512) + .getIntent(activity) + activity.startActivityForResult(intent, REQUEST_CROP_PROFILE_IMAGE) + } else { + val profile = + requestData.remove(REQUEST_FILE_PROFILE_IMAGE) as? Profile ?: return + val path = saveFile(uri, "profile${profile.id}") + profile.image = path + listeners.remove(REQUEST_FILE_PROFILE_IMAGE)?.invoke(profile) + } + } + REQUEST_CROP_HEADER_BACKGROUND -> { + uri = CropImage.getActivityResult(data)?.uri ?: return + val path = saveFile(uri, "header") + app.config.ui.headerBackground = path + listeners.remove(REQUEST_FILE_HEADER_BACKGROUND)?.invoke(path) + } + REQUEST_CROP_APP_BACKGROUND -> { + uri = CropImage.getActivityResult(data)?.uri ?: return + val path = saveFile(uri, "background") + app.config.ui.appBackground = path + listeners.remove(REQUEST_FILE_APP_BACKGROUND)?.invoke(path) + } + REQUEST_CROP_PROFILE_IMAGE -> { + uri = CropImage.getActivityResult(data)?.uri ?: return + val profile = requestData.remove(REQUEST_FILE_PROFILE_IMAGE) as? Profile ?: return + val path = saveFile(uri, "profile${profile.id}") + profile.image = path + listeners.remove(REQUEST_FILE_PROFILE_IMAGE)?.invoke(profile) + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java b/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java deleted file mode 100644 index 0b2d01b5..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/Notifier.java +++ /dev/null @@ -1,353 +0,0 @@ -package pl.szczodrzynski.edziennik; - -import android.app.IntentService; -import android.app.Notification; -import android.app.NotificationChannel; -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.os.Build; -import android.util.Log; - -import androidx.core.app.NotificationCompat; -import androidx.core.content.ContextCompat; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull; -import pl.szczodrzynski.edziennik.receivers.BootReceiver; -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.utils.models.Time; - -import static androidx.core.app.NotificationCompat.PRIORITY_DEFAULT; -import static androidx.core.app.NotificationCompat.PRIORITY_MAX; - -public class Notifier { - - private static final String TAG = "Notifier"; - public static final int ID_GET_DATA = 1337000; - public static final int ID_GET_DATA_ERROR = 1337001; - private static String CHANNEL_GET_DATA_NAME; - private static String CHANNEL_GET_DATA_DESC; - private static final String GROUP_KEY_GET_DATA = "pl.szczodrzynski.edziennik.GET_DATA"; - - public static final int ID_NOTIFICATIONS = 1337002; - public static String CHANNEL_NOTIFICATIONS_NAME; - public static String CHANNEL_NOTIFICATIONS_DESC; - public static final String GROUP_KEY_NOTIFICATIONS = "pl.szczodrzynski.edziennik.NOTIFICATIONS"; - - public static final int ID_NOTIFICATIONS_QUIET = 1337002; - public static String CHANNEL_NOTIFICATIONS_QUIET_NAME; - public static String CHANNEL_NOTIFICATIONS_QUIET_DESC; - public static final String GROUP_KEY_NOTIFICATIONS_QUIET = "pl.szczodrzynski.edziennik.NOTIFICATIONS_QUIET"; - - private static final int ID_UPDATES = 1337003; - private static String CHANNEL_UPDATES_NAME; - private static String CHANNEL_UPDATES_DESC; - private static final String GROUP_KEY_UPDATES = "pl.szczodrzynski.edziennik.UPDATES"; - - private App app; - public NotificationManager notificationManager; - private NotificationCompat.Builder getDataNotificationBuilder; - public int notificationColor; - - Notifier(App _app) { - this.app = _app; - - CHANNEL_GET_DATA_NAME = app.getString(R.string.notification_channel_get_data_name); - CHANNEL_GET_DATA_DESC = app.getString(R.string.notification_channel_get_data_desc); - CHANNEL_NOTIFICATIONS_NAME = app.getString(R.string.notification_channel_notifications_name); - CHANNEL_NOTIFICATIONS_DESC = app.getString(R.string.notification_channel_notifications_desc); - CHANNEL_NOTIFICATIONS_QUIET_NAME = app.getString(R.string.notification_channel_notifications_quiet_name); - CHANNEL_NOTIFICATIONS_QUIET_DESC = app.getString(R.string.notification_channel_notifications_quiet_desc); - CHANNEL_UPDATES_NAME = app.getString(R.string.notification_channel_updates_name); - CHANNEL_UPDATES_DESC = app.getString(R.string.notification_channel_updates_desc); - - notificationColor = ContextCompat.getColor(app.getContext(), R.color.colorPrimary); - notificationManager = (NotificationManager) app.getSystemService(Context.NOTIFICATION_SERVICE); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - NotificationChannel channelGetData = new NotificationChannel(GROUP_KEY_GET_DATA, CHANNEL_GET_DATA_NAME, NotificationManager.IMPORTANCE_MIN); - channelGetData.setDescription(CHANNEL_GET_DATA_DESC); - notificationManager.createNotificationChannel(channelGetData); - - NotificationChannel channelNotifications = new NotificationChannel(GROUP_KEY_NOTIFICATIONS, CHANNEL_NOTIFICATIONS_NAME, NotificationManager.IMPORTANCE_HIGH); - channelNotifications.setDescription(CHANNEL_NOTIFICATIONS_DESC); - channelNotifications.enableLights(true); - channelNotifications.setLightColor(notificationColor); - notificationManager.createNotificationChannel(channelNotifications); - - NotificationChannel channelNotificationsQuiet = new NotificationChannel(GROUP_KEY_NOTIFICATIONS_QUIET, CHANNEL_NOTIFICATIONS_QUIET_NAME, NotificationManager.IMPORTANCE_DEFAULT); - channelNotificationsQuiet.setDescription(CHANNEL_NOTIFICATIONS_QUIET_DESC); - channelNotificationsQuiet.setSound(null, null); - channelNotificationsQuiet.enableVibration(false); - notificationManager.createNotificationChannel(channelNotificationsQuiet); - - NotificationChannel channelUpdates = new NotificationChannel(GROUP_KEY_UPDATES, CHANNEL_UPDATES_NAME, NotificationManager.IMPORTANCE_HIGH); - channelUpdates.setDescription(CHANNEL_UPDATES_DESC); - notificationManager.createNotificationChannel(channelUpdates); - } - } - - public boolean shouldBeQuiet() { - long now = Time.getNow().getInMillis(); - long start = app.config.getSync().getQuietHoursStart(); - long end = app.config.getSync().getQuietHoursEnd(); - if (start > end) { - end += 1000 * 60 * 60 * 24; - //Log.d(TAG, "Night passing"); - } - if (start > now) { - now += 1000 * 60 * 60 * 24; - //Log.d(TAG, "Now is smaller"); - } - //Log.d(TAG, "Start is "+start+", now is "+now+", end is "+end); - return start > 0 && now >= start && now <= end; - } - - public int getNotificationDefaults() { - return (shouldBeQuiet() ? 0 : Notification.DEFAULT_ALL); - } - public String getNotificationGroup() { - return shouldBeQuiet() ? GROUP_KEY_NOTIFICATIONS_QUIET : GROUP_KEY_NOTIFICATIONS; - } - public int getNotificationPriority() { - return shouldBeQuiet() ? PRIORITY_DEFAULT : PRIORITY_MAX; - } - - /* _____ _ _____ _ - | __ \ | | / ____| | | - | | | | __ _| |_ __ _ | | __ ___| |_ - | | | |/ _` | __/ _` | | | |_ |/ _ \ __| - | |__| | (_| | || (_| | | |__| | __/ |_ - |_____/ \__,_|\__\__,_| \_____|\___|\_*/ - public Notification notificationGetDataShow(int maxProgress) { - /*Intent notificationIntent = new Intent(app.getContext(), SyncService.class); - notificationIntent.setAction(ACTION_CANCEL); - PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0, - notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT);*/ - - getDataNotificationBuilder = new NotificationCompat.Builder(app, GROUP_KEY_GET_DATA) - .setSmallIcon(android.R.drawable.stat_sys_download) - .setColor(notificationColor) - .setContentTitle(app.getString(R.string.notification_get_data_title)) - .setContentText(app.getString(R.string.notification_get_data_text)) - //.addAction(R.drawable.ic_notification, app.getString(R.string.notification_get_data_cancel), pendingIntent) - //.setGroup(GROUP_KEY_GET_DATA) - .setOngoing(true) - .setProgress(maxProgress, 0, false) - .setTicker(app.getString(R.string.notification_get_data_summary)) - .setPriority(NotificationCompat.PRIORITY_LOW); - return getDataNotificationBuilder.build(); - } - - public Notification notificationGetDataProgress(int progress, int maxProgress) { - getDataNotificationBuilder.setProgress(maxProgress, progress, false); - return getDataNotificationBuilder.build(); - } - - public Notification notificationGetDataAction(int stringResId) { - getDataNotificationBuilder.setContentTitle(app.getString(R.string.sync_action_format, app.getString(stringResId))); - return getDataNotificationBuilder.build(); - } - - public Notification notificationGetDataProfile(String profileName) { - getDataNotificationBuilder.setContentText(profileName); - return getDataNotificationBuilder.build(); - } - - public Notification notificationGetDataError(String profileName, String error, int failedProfileId) { - Intent notificationIntent = new Intent(app.getContext(), Notifier.GetDataRetryService.class); - notificationIntent.putExtra("failedProfileId", failedProfileId); - PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0, - notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT); - - getDataNotificationBuilder.mActions.clear(); - /*try { - //Use reflection clean up old actions - Field f = getDataNotificationBuilder.getClass().getDeclaredField("mActions"); - f.setAccessible(true); - f.set(getDataNotificationBuilder, new ArrayList()); - } catch (Exception e) { - e.printStackTrace(); - }*/ - - getDataNotificationBuilder.setProgress(0, 0, false) - .setTicker(app.getString(R.string.notification_get_data_error_summary)) - .setSmallIcon(android.R.drawable.stat_sys_warning) - .addAction(R.drawable.ic_notification, app.getString(R.string.notification_get_data_once_again), pendingIntent) - .setContentTitle(app.getString(R.string.notification_get_data_error_title, profileName)) - .setContentText(error) - .setStyle(new NotificationCompat.BigTextStyle().bigText(error)) - .setOngoing(false); - return getDataNotificationBuilder.build(); - } - - public void notificationPost(int id, Notification notification) { - notificationManager.notify(id, notification); - } - - public void notificationCancel(int id) { - notificationManager.cancel(id); - } - - //public void notificationGetDataHide() { - // notificationManager.cancel(ID_GET_DATA); - // } - - public static class GetDataRetryService extends IntentService { - private static final String TAG = "Notifier/GetDataRetry"; - - public GetDataRetryService() { - super(Notifier.GetDataRetryService.class.getSimpleName()); - } - - @Override - protected void onHandleIntent(Intent intent) { - - - } - } - - /* _ _ _ _ __ _ _ _ - | \ | | | | (_)/ _(_) | | (_) - | \| | ___ | |_ _| |_ _ ___ __ _| |_ _ ___ _ __ - | . ` |/ _ \| __| | _| |/ __/ _` | __| |/ _ \| '_ \ - | |\ | (_) | |_| | | | | (_| (_| | |_| | (_) | | | | - |_| \_|\___/ \__|_|_| |_|\___\__,_|\__|_|\___/|_| |*/ - public void add(pl.szczodrzynski.edziennik.utils.models.Notification notification) { - app.appConfig.notifications.add(notification); - } - - public void postAll(ProfileFull profile) { - Collections.sort(app.appConfig.notifications, (o1, o2) -> (o2.addedDate - o1.addedDate > 0) ? 1 : (o2.addedDate - o1.addedDate < 0) ? -1 : 0); - if (profile != null && !profile.getSyncNotifications()) - return; - - if (app.appConfig.notifications.size() > 40) { - app.appConfig.notifications.subList(40, app.appConfig.notifications.size() - 1).clear(); - } - - int unreadCount = 0; - List notificationList = new ArrayList<>(); - for (pl.szczodrzynski.edziennik.utils.models.Notification notification: app.appConfig.notifications) { - if (!notification.notified) { - notification.seen = false; - notification.notified = true; - unreadCount++; - if (notificationList.size() < 10) { - notificationList.add(notification); - } - } - else { - notification.seen = true; - } - } - - for (pl.szczodrzynski.edziennik.utils.models.Notification notification: notificationList) { - Intent intent = new Intent(app, MainActivity.class); - notification.fillIntent(intent); - PendingIntent pendingIntent = PendingIntent.getActivity(app, notification.id, intent, 0); - NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(app, getNotificationGroup()) - // title, text, type, date - .setContentTitle(notification.title) - .setContentText(notification.text) - .setSubText(pl.szczodrzynski.edziennik.utils.models.Notification.stringType(app, notification.type)) - .setWhen(notification.addedDate) - .setTicker(app.getString(R.string.notification_ticker_format, pl.szczodrzynski.edziennik.utils.models.Notification.stringType(app, notification.type))) - // icon, color, lights, priority - .setSmallIcon(R.drawable.ic_notification) - .setColor(notificationColor) - .setLights(0xFF00FFFF, 2000, 2000) - .setPriority(getNotificationPriority()) - // channel, group, style - .setChannelId(getNotificationGroup()) - .setGroup(getNotificationGroup()) - .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY) - .setStyle(new NotificationCompat.BigTextStyle().bigText(notification.text)) - // intent, auto cancel - .setContentIntent(pendingIntent) - .setAutoCancel(true); - if (!shouldBeQuiet()) { - notificationBuilder.setDefaults(getNotificationDefaults()); - } - notificationManager.notify(notification.id, notificationBuilder.build()); - } - - if (notificationList.size() > 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - Intent intent = new Intent(app, MainActivity.class); - intent.setAction("android.intent.action.MAIN"); - intent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_NOTIFICATIONS); - PendingIntent pendingIntent = PendingIntent.getActivity(app, ID_NOTIFICATIONS, - intent, 0); - - NotificationCompat.Builder groupBuilder = - new NotificationCompat.Builder(app, getNotificationGroup()) - .setSmallIcon(R.drawable.ic_notification) - .setColor(notificationColor) - .setContentTitle(app.getString(R.string.notification_new_notification_title_format, unreadCount)) - .setGroupSummary(true) - .setAutoCancel(true) - .setChannelId(getNotificationGroup()) - .setGroup(getNotificationGroup()) - .setLights(0xFF00FFFF, 2000, 2000) - .setPriority(getNotificationPriority()) - .setContentIntent(pendingIntent) - .setStyle(new NotificationCompat.BigTextStyle()); - if (!shouldBeQuiet()) { - groupBuilder.setDefaults(getNotificationDefaults()); - } - notificationManager.notify(ID_NOTIFICATIONS, groupBuilder.build()); - } - } - - /* _ _ _ _ - | | | | | | | | - | | | |_ __ __| | __ _| |_ ___ ___ - | | | | '_ \ / _` |/ _` | __/ _ \/ __| - | |__| | |_) | (_| | (_| | || __/\__ \ - \____/| .__/ \__,_|\__,_|\__\___||___/ - | | - |*/ - public void notificationUpdatesShow(String updateVersion, String updateUrl, String updateFilename, boolean updateDirect) { - if (!app.config.getSync().getNotifyAboutUpdates()) - return; - Intent notificationIntent = new Intent(app.getContext(), BootReceiver.NotificationActionService.class) - .putExtra("update_version", updateVersion) - .putExtra("update_url", updateUrl) - .putExtra("update_filename", updateFilename) - .putExtra("update_direct", updateDirect); - - PendingIntent pendingIntent = PendingIntent.getService(app.getContext(), 0, - notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT); - - NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(app, GROUP_KEY_UPDATES) - .setSmallIcon(android.R.drawable.stat_sys_download_done) - .setColor(notificationColor) - .setContentTitle(app.getString(R.string.notification_updates_title)) - .setContentText(app.getString(R.string.notification_updates_text, updateVersion)) - .setLights(0xFF00FFFF, 2000, 2000) - .setContentIntent(pendingIntent) - .setTicker(app.getString(R.string.notification_updates_summary)) - .setPriority(PRIORITY_MAX) - .setAutoCancel(true); - if (!shouldBeQuiet()) { - notificationBuilder.setDefaults(getNotificationDefaults()); - } - notificationManager.notify(ID_UPDATES, notificationBuilder.build()); - } - - public void notificationUpdatesHide() { - if (!app.config.getSync().getNotifyAboutUpdates()) - return; - notificationManager.cancel(ID_UPDATES); - } - - public void dump() { - for (pl.szczodrzynski.edziennik.utils.models.Notification notification: app.appConfig.notifications) { - Log.d(TAG, "Profile"+notification.profileId+" Notification from "+ Date.fromMillis(notification.addedDate).getFormattedString()+" "+ Time.fromMillis(notification.addedDate).getStringHMS()+" - "+notification.text); - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt index 5298e554..e29d93ad 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/Config.kt @@ -4,6 +4,7 @@ package pl.szczodrzynski.edziennik.config +import com.google.gson.JsonObject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -11,16 +12,14 @@ import kotlinx.coroutines.launch import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.BuildConfig import pl.szczodrzynski.edziennik.config.db.ConfigEntry -import pl.szczodrzynski.edziennik.config.utils.ConfigMigration -import pl.szczodrzynski.edziennik.config.utils.get -import pl.szczodrzynski.edziennik.config.utils.set -import pl.szczodrzynski.edziennik.config.utils.toHashMap +import pl.szczodrzynski.edziennik.config.utils.* +import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update import pl.szczodrzynski.edziennik.data.db.AppDb import kotlin.coroutines.CoroutineContext class Config(val db: AppDb) : CoroutineScope, AbstractConfig { companion object { - const val DATA_VERSION = 2 + const val DATA_VERSION = 12 } private val job = Job() @@ -39,6 +38,25 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig { get() { mDataVersion = mDataVersion ?: values.get("dataVersion", 0); return mDataVersion ?: 0 } set(value) { set("dataVersion", value); mDataVersion = value } + private var mHash: String? = null + var hash: String + get() { mHash = mHash ?: values.get("hash", ""); return mHash ?: "" } + set(value) { set("hash", value); mHash = value } + + private var mLastProfileId: Int? = null + var lastProfileId: Int + get() { mLastProfileId = mLastProfileId ?: values.get("lastProfileId", 0); return mLastProfileId ?: 0 } + set(value) { set("lastProfileId", value); mLastProfileId = value } + + private var mUpdatesChannel: String? = null + var updatesChannel: String + get() { mUpdatesChannel = mUpdatesChannel ?: values.get("updatesChannel", "release"); return mUpdatesChannel ?: "release" } + set(value) { set("updatesChannel", value); mUpdatesChannel = value } + private var mUpdate: Update? = null + var update: Update? + get() { mUpdate = mUpdate ?: values.get("update", null as Update?); return mUpdate ?: null as Update? } + set(value) { set("update", value); mUpdate = value } + private var mAppVersion: Int? = null var appVersion: Int get() { mAppVersion = mAppVersion ?: values.get("appVersion", BuildConfig.VERSION_CODE); return mAppVersion ?: BuildConfig.VERSION_CODE } @@ -49,6 +67,21 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig { get() { mLoginFinished = mLoginFinished ?: values.get("loginFinished", false); return mLoginFinished ?: false } set(value) { set("loginFinished", value); mLoginFinished = value } + private var mPrivacyPolicyAccepted: Boolean? = null + var privacyPolicyAccepted: Boolean + get() { mPrivacyPolicyAccepted = mPrivacyPolicyAccepted ?: values.get("privacyPolicyAccepted", false); return mPrivacyPolicyAccepted ?: false } + set(value) { set("privacyPolicyAccepted", value); mPrivacyPolicyAccepted = value } + + private var mDevMode: Boolean? = null + var devMode: Boolean? + get() { mDevMode = mDevMode ?: values.getBooleanOrNull("debugMode"); return mDevMode } + set(value) { set("debugMode", value?.toString()); mDevMode = value } + + private var mEnableChucker: Boolean? = null + var enableChucker: Boolean? + get() { mEnableChucker = mEnableChucker ?: values.getBooleanOrNull("enableChucker"); return mEnableChucker } + set(value) { set("enableChucker", value?.toString()); mEnableChucker = value } + private var mDevModePassword: String? = null var devModePassword: String? get() { mDevModePassword = mDevModePassword ?: values.get("devModePassword", null as String?); return mDevModePassword } @@ -64,6 +97,36 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig { get() { mAppRateSnackbarTime = mAppRateSnackbarTime ?: values.get("appRateSnackbarTime", 0L); return mAppRateSnackbarTime ?: 0L } set(value) { set("appRateSnackbarTime", value); mAppRateSnackbarTime = value } + private var mRunSync: Boolean? = null + var runSync: Boolean + get() { mRunSync = mRunSync ?: values.get("runSync", false); return mRunSync ?: false } + set(value) { set("runSync", value); mRunSync = value } + + private var mWidgetConfigs: JsonObject? = null + var widgetConfigs: JsonObject + get() { mWidgetConfigs = mWidgetConfigs ?: values.get("widgetConfigs", JsonObject()); return mWidgetConfigs ?: JsonObject() } + set(value) { set("widgetConfigs", value); mWidgetConfigs = value } + + private var mArchiverEnabled: Boolean? = null + var archiverEnabled: Boolean + get() { mArchiverEnabled = mArchiverEnabled ?: values.get("archiverEnabled", true); return mArchiverEnabled ?: true } + set(value) { set("archiverEnabled", value); mArchiverEnabled = value } + + private var mValidation: String? = null + var validation: String? + get() { mValidation = mValidation ?: values["buildValidation"]; return mValidation } + set(value) { set("buildValidation", value); mValidation = value } + + private var mApiInvalidCert: String? = null + var apiInvalidCert: String? + get() { mApiInvalidCert = mApiInvalidCert ?: values["apiInvalidCert"]; return mApiInvalidCert } + set(value) { set("apiInvalidCert", value); mApiInvalidCert = value } + + private var mApiAvailabilityCheck: Boolean? = null + var apiAvailabilityCheck: Boolean + get() { mApiAvailabilityCheck = mApiAvailabilityCheck ?: values.get("apiAvailabilityCheck", true); return mApiAvailabilityCheck ?: true } + set(value) { set("apiAvailabilityCheck", value); mApiAvailabilityCheck = value } + private var rawEntries: List = db.configDao().getAllNow() private val profileConfigs: HashMap = hashMapOf() init { @@ -74,8 +137,11 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig { ConfigMigration(app, this) } fun getFor(profileId: Int): ProfileConfig { - return profileConfigs[profileId] ?: ProfileConfig(db, profileId, rawEntries) + return profileConfigs[profileId] ?: ProfileConfig(db, profileId, db.configDao().getAllNow(profileId)).also { + profileConfigs[profileId] = it + } } + fun forProfile() = getFor(App.profileId) fun setProfile(profileId: Int) { } @@ -86,4 +152,4 @@ class Config(val db: AppDb) : CoroutineScope, AbstractConfig { db.configDao().add(ConfigEntry(-1, key, value)) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigGrades.kt index 130d8129..267ec322 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigGrades.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigGrades.kt @@ -6,17 +6,11 @@ package pl.szczodrzynski.edziennik.config import pl.szczodrzynski.edziennik.config.utils.get import pl.szczodrzynski.edziennik.config.utils.set +import pl.szczodrzynski.edziennik.utils.managers.GradesManager class ConfigGrades(private val config: Config) { - companion object { - const val ORDER_BY_DATE_DESC = 0 - const val ORDER_BY_SUBJECT_ASC = 1 - const val ORDER_BY_DATE_ASC = 2 - const val ORDER_BY_SUBJECT_DESC = 3 - } - private var mOrderBy: Int? = null var orderBy: Int - get() { mOrderBy = mOrderBy ?: config.values.get("gradesOrderBy", 0); return mOrderBy ?: 0 } + get() { mOrderBy = mOrderBy ?: config.values.get("gradesOrderBy", 0); return mOrderBy ?: GradesManager.ORDER_BY_DATE_DESC } set(value) { config.set("gradesOrderBy", value); mOrderBy = value } -} \ No newline at end of file +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt index 01810824..387e5cf7 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigSync.kt @@ -4,16 +4,34 @@ package pl.szczodrzynski.edziennik.config +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import pl.szczodrzynski.edziennik.BuildConfig import pl.szczodrzynski.edziennik.config.utils.get import pl.szczodrzynski.edziennik.config.utils.getIntList import pl.szczodrzynski.edziennik.config.utils.set +import pl.szczodrzynski.edziennik.config.utils.setMap +import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus +import pl.szczodrzynski.edziennik.utils.models.Time class ConfigSync(private val config: Config) { + private val gson = Gson() + + private var mDontShowAppManagerDialog: Boolean? = null + var dontShowAppManagerDialog: Boolean + get() { mDontShowAppManagerDialog = mDontShowAppManagerDialog ?: config.values.get("dontShowAppManagerDialog", false); return mDontShowAppManagerDialog ?: false } + set(value) { config.set("dontShowAppManagerDialog", value); mDontShowAppManagerDialog = value } + private var mSyncEnabled: Boolean? = null var enabled: Boolean get() { mSyncEnabled = mSyncEnabled ?: config.values.get("syncEnabled", true); return mSyncEnabled ?: true } set(value) { config.set("syncEnabled", value); mSyncEnabled = value } + private var mWebPushEnabled: Boolean? = null + var webPushEnabled: Boolean + get() { mWebPushEnabled = mWebPushEnabled ?: config.values.get("webPushEnabled", true); return mWebPushEnabled ?: true } + set(value) { config.set("webPushEnabled", value); mWebPushEnabled = value } + private var mSyncOnlyWifi: Boolean? = null var onlyWifi: Boolean get() { mSyncOnlyWifi = mSyncOnlyWifi ?: config.values.get("syncOnlyWifi", false); return mSyncOnlyWifi ?: notifyAboutUpdates } @@ -29,20 +47,30 @@ class ConfigSync(private val config: Config) { get() { mNotifyAboutUpdates = mNotifyAboutUpdates ?: config.values.get("notifyAboutUpdates", true); return mNotifyAboutUpdates ?: true } set(value) { config.set("notifyAboutUpdates", value); mNotifyAboutUpdates = value } + private var mLastAppSync: Long? = null + var lastAppSync: Long + get() { mLastAppSync = mLastAppSync ?: config.values.get("lastAppSync", 0L); return mLastAppSync ?: 0L } + set(value) { config.set("lastAppSync", value); mLastAppSync = value } + /* ____ _ _ _ / __ \ (_) | | | | | | | |_ _ _ ___| |_ | |__ ___ _ _ _ __ ___ | | | | | | | |/ _ \ __| | '_ \ / _ \| | | | '__/ __| | |__| | |_| | | __/ |_ | | | | (_) | |_| | | \__ \ \___\_\\__,_|_|\___|\__| |_| |_|\___/ \__,_|_| |__*/ - private var mQuietHoursStart: Long? = null - var quietHoursStart: Long - get() { mQuietHoursStart = mQuietHoursStart ?: config.values.get("quietHoursStart", 0L); return mQuietHoursStart ?: 0L } + private var mQuietHoursEnabled: Boolean? = null + var quietHoursEnabled: Boolean + get() { mQuietHoursEnabled = mQuietHoursEnabled ?: config.values.get("quietHoursEnabled", false); return mQuietHoursEnabled ?: false } + set(value) { config.set("quietHoursEnabled", value); mQuietHoursEnabled = value } + + private var mQuietHoursStart: Time? = null + var quietHoursStart: Time? + get() { mQuietHoursStart = mQuietHoursStart ?: config.values.get("quietHoursStart", null as Time?); return mQuietHoursStart } set(value) { config.set("quietHoursStart", value); mQuietHoursStart = value } - private var mQuietHoursEnd: Long? = null - var quietHoursEnd: Long - get() { mQuietHoursEnd = mQuietHoursEnd ?: config.values.get("quietHoursEnd", 0L); return mQuietHoursEnd ?: 0L } + private var mQuietHoursEnd: Time? = null + var quietHoursEnd: Time? + get() { mQuietHoursEnd = mQuietHoursEnd ?: config.values.get("quietHoursEnd", null as Time?); return mQuietHoursEnd } set(value) { config.set("quietHoursEnd", value); mQuietHoursEnd = value } private var mQuietDuringLessons: Boolean? = null @@ -72,6 +100,10 @@ class ConfigSync(private val config: Config) { var tokenVulcan: String? get() { mTokenVulcan = mTokenVulcan ?: config.values.get("tokenVulcan", null as String?); return mTokenVulcan } set(value) { config.set("tokenVulcan", value); mTokenVulcan = value } + private var mTokenVulcanHebe: String? = null + var tokenVulcanHebe: String? + get() { mTokenVulcanHebe = mTokenVulcanHebe ?: config.values.get("tokenVulcanHebe", null as String?); return mTokenVulcanHebe } + set(value) { config.set("tokenVulcanHebe", value); mTokenVulcanHebe = value } private var mTokenMobidziennikList: List? = null var tokenMobidziennikList: List @@ -85,4 +117,26 @@ class ConfigSync(private val config: Config) { var tokenVulcanList: List get() { mTokenVulcanList = mTokenVulcanList ?: config.values.getIntList("tokenVulcanList", listOf()); return mTokenVulcanList ?: listOf() } set(value) { config.set("tokenVulcanList", value); mTokenVulcanList = value } -} \ No newline at end of file + private var mTokenVulcanHebeList: List? = null + var tokenVulcanHebeList: List + get() { mTokenVulcanHebeList = mTokenVulcanHebeList ?: config.values.getIntList("tokenVulcanHebeList", listOf()); return mTokenVulcanHebeList ?: listOf() } + set(value) { config.set("tokenVulcanHebeList", value); mTokenVulcanHebeList = value } + + private var mRegisterAvailability: Map? = null + var registerAvailability: Map + get() { + val flavor = config.values.get("registerAvailabilityFlavor", null as String?) + if (BuildConfig.FLAVOR != flavor) + return mapOf() + + mRegisterAvailability = mRegisterAvailability ?: config.values.get("registerAvailability", null as String?)?.let { it -> + gson.fromJson(it, object: TypeToken>(){}.type) + } + return mRegisterAvailability ?: mapOf() + } + set(value) { + config.setMap("registerAvailability", value) + config.set("registerAvailabilityFlavor", BuildConfig.FLAVOR) + mRegisterAvailability = value + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt index 04952148..f36652a1 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ConfigUI.kt @@ -7,7 +7,6 @@ package pl.szczodrzynski.edziennik.config import pl.szczodrzynski.edziennik.config.utils.get import pl.szczodrzynski.edziennik.config.utils.getIntList import pl.szczodrzynski.edziennik.config.utils.set -import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel class ConfigUI(private val config: Config) { private var mTheme: Int? = null @@ -45,18 +44,18 @@ class ConfigUI(private val config: Config) { get() { mOpenDrawerOnBackPressed = mOpenDrawerOnBackPressed ?: config.values.get("openDrawerOnBackPressed", false); return mOpenDrawerOnBackPressed ?: false } set(value) { config.set("openDrawerOnBackPressed", value); mOpenDrawerOnBackPressed = value } - private var mAgendaViewType: Int? = null - var agendaViewType: Int - get() { mAgendaViewType = mAgendaViewType ?: config.values.get("agendaViewType", 0); return mAgendaViewType ?: 0 } - set(value) { config.set("agendaViewType", value); mAgendaViewType = value } - - private var mHomeCards: List? = null - var homeCards: List - get() { mHomeCards = mHomeCards ?: config.values.get("homeCards", listOf(), HomeCardModel::class.java); return mHomeCards ?: listOf() } - set(value) { config.set("homeCards", value); mHomeCards = value } - private var mSnowfall: Boolean? = null var snowfall: Boolean get() { mSnowfall = mSnowfall ?: config.values.get("snowfall", false); return mSnowfall ?: false } set(value) { config.set("snowfall", value); mSnowfall = value } + + private var mEggfall: Boolean? = null + var eggfall: Boolean + get() { mEggfall = mEggfall ?: config.values.get("eggfall", false); return mEggfall ?: false } + set(value) { config.set("eggfall", value); mEggfall = value } + + private var mBottomSheetOpened: Boolean? = null + var bottomSheetOpened: Boolean + get() { mBottomSheetOpened = mBottomSheetOpened ?: config.values.get("bottomSheetOpened", false); return mBottomSheetOpened ?: false } + set(value) { config.set("bottomSheetOpened", value); mBottomSheetOpened = value } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfig.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfig.kt index ec5ae3f0..c4c65ac3 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfig.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfig.kt @@ -9,6 +9,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.launch import pl.szczodrzynski.edziennik.config.db.ConfigEntry +import pl.szczodrzynski.edziennik.config.utils.ProfileConfigMigration import pl.szczodrzynski.edziennik.config.utils.get import pl.szczodrzynski.edziennik.config.utils.set import pl.szczodrzynski.edziennik.config.utils.toHashMap @@ -17,7 +18,7 @@ import kotlin.coroutines.CoroutineContext class ProfileConfig(val db: AppDb, val profileId: Int, rawEntries: List) : CoroutineScope, AbstractConfig { companion object { - const val DATA_VERSION = 1 + const val DATA_VERSION = 2 } private val job = Job() @@ -27,8 +28,10 @@ class ProfileConfig(val db: AppDb, val profileId: Int, rawEntries: List = hashMapOf() val grades by lazy { ProfileConfigGrades(this) } + val ui by lazy { ProfileConfigUI(this) } + val sync by lazy { ProfileConfigSync(this) } + val attendance by lazy { ProfileConfigAttendance(this) } /* - val sync by lazy { ConfigSync(this) } val timetable by lazy { ConfigTimetable(this) } val grades by lazy { ConfigGrades(this) }*/ @@ -37,10 +40,15 @@ class ProfileConfig(val db: AppDb, val profileId: Int, rawEntries: List? = null + var dontCountGrades: List + get() { mDontCountGrades = mDontCountGrades ?: config.values.get("dontCountGrades", listOf()); return mDontCountGrades ?: listOf() } + set(value) { config.set("dontCountGrades", value); mDontCountGrades = value } + + private var mHideSticksFromOld: Boolean? = null + var hideSticksFromOld: Boolean + get() { mHideSticksFromOld = mHideSticksFromOld ?: config.values.get("hideSticksFromOld", false); return mHideSticksFromOld ?: false } + set(value) { config.set("hideSticksFromOld", value); mHideSticksFromOld = value } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigSync.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigSync.kt new file mode 100644 index 00000000..6d8f95e3 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigSync.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-2-21. + */ + +package pl.szczodrzynski.edziennik.config + +import pl.szczodrzynski.edziennik.config.utils.get +import pl.szczodrzynski.edziennik.config.utils.set + +class ProfileConfigSync(private val config: ProfileConfig) { + private var mNotificationFilter: List? = null + var notificationFilter: List + get() { mNotificationFilter = mNotificationFilter ?: config.values.get("notificationFilter", listOf()); return mNotificationFilter ?: listOf() } + set(value) { config.set("notificationFilter", value); mNotificationFilter = value } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt new file mode 100644 index 00000000..d40f0dfc --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt @@ -0,0 +1,72 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-19. + */ + +package pl.szczodrzynski.edziennik.config + +import pl.szczodrzynski.edziennik.config.utils.get +import pl.szczodrzynski.edziennik.config.utils.set +import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.AGENDA_DEFAULT +import pl.szczodrzynski.edziennik.ui.modules.home.HomeCardModel + +class ProfileConfigUI(private val config: ProfileConfig) { + private var mAgendaViewType: Int? = null + var agendaViewType: Int + get() { mAgendaViewType = mAgendaViewType ?: config.values.get("agendaViewType", 0); return mAgendaViewType ?: AGENDA_DEFAULT } + set(value) { config.set("agendaViewType", value); mAgendaViewType = value } + + private var mAgendaCompactMode: Boolean? = null + var agendaCompactMode: Boolean + get() { mAgendaCompactMode = mAgendaCompactMode ?: config.values.get("agendaCompactMode", false); return mAgendaCompactMode ?: false } + set(value) { config.set("agendaCompactMode", value); mAgendaCompactMode = value } + + private var mAgendaGroupByType: Boolean? = null + var agendaGroupByType: Boolean + get() { mAgendaGroupByType = mAgendaGroupByType ?: config.values.get("agendaGroupByType", false); return mAgendaGroupByType ?: false } + set(value) { config.set("agendaGroupByType", value); mAgendaGroupByType = value } + + private var mAgendaLessonChanges: Boolean? = null + var agendaLessonChanges: Boolean + get() { mAgendaLessonChanges = mAgendaLessonChanges ?: config.values.get("agendaLessonChanges", true); return mAgendaLessonChanges ?: true } + set(value) { config.set("agendaLessonChanges", value); mAgendaLessonChanges = value } + + private var mAgendaTeacherAbsence: Boolean? = null + var agendaTeacherAbsence: Boolean + get() { mAgendaTeacherAbsence = mAgendaTeacherAbsence ?: config.values.get("agendaTeacherAbsence", true); return mAgendaTeacherAbsence ?: true } + set(value) { config.set("agendaTeacherAbsence", value); mAgendaTeacherAbsence = value } + + private var mAgendaElearningMark: Boolean? = null + var agendaElearningMark: Boolean + get() { mAgendaElearningMark = mAgendaElearningMark ?: config.values.get("agendaElearningMark", false); return mAgendaElearningMark ?: false } + set(value) { config.set("agendaElearningMark", value); mAgendaElearningMark = value } + + private var mAgendaElearningGroup: Boolean? = null + var agendaElearningGroup: Boolean + get() { mAgendaElearningGroup = mAgendaElearningGroup ?: config.values.get("agendaElearningGroup", true); return mAgendaElearningGroup ?: true } + set(value) { config.set("agendaElearningGroup", value); mAgendaElearningGroup = value } + + private var mHomeCards: List? = null + var homeCards: List + get() { mHomeCards = mHomeCards ?: config.values.get("homeCards", listOf(), HomeCardModel::class.java); return mHomeCards ?: listOf() } + set(value) { config.set("homeCards", value); mHomeCards = value } + + private var mMessagesGreetingOnCompose: Boolean? = null + var messagesGreetingOnCompose: Boolean + get() { mMessagesGreetingOnCompose = mMessagesGreetingOnCompose ?: config.values.get("messagesGreetingOnCompose", true); return mMessagesGreetingOnCompose ?: true } + set(value) { config.set("messagesGreetingOnCompose", value); mMessagesGreetingOnCompose = value } + + private var mMessagesGreetingOnReply: Boolean? = null + var messagesGreetingOnReply: Boolean + get() { mMessagesGreetingOnReply = mMessagesGreetingOnReply ?: config.values.get("messagesGreetingOnReply", true); return mMessagesGreetingOnReply ?: true } + set(value) { config.set("messagesGreetingOnReply", value); mMessagesGreetingOnReply = value } + + private var mMessagesGreetingOnForward: Boolean? = null + var messagesGreetingOnForward: Boolean + get() { mMessagesGreetingOnForward = mMessagesGreetingOnForward ?: config.values.get("messagesGreetingOnForward", false); return mMessagesGreetingOnForward ?: false } + set(value) { config.set("messagesGreetingOnForward", value); mMessagesGreetingOnForward = value } + + private var mMessagesGreetingText: String? = null + var messagesGreetingText: String? + get() { mMessagesGreetingText = mMessagesGreetingText ?: config.values["messagesGreetingText"]; return mMessagesGreetingText } + set(value) { config.set("messagesGreetingText", value); mMessagesGreetingText = value } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/db/ConfigDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/db/ConfigDao.kt index d4665910..f55df857 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/config/db/ConfigDao.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/db/ConfigDao.kt @@ -22,4 +22,7 @@ interface ConfigDao { @Query("SELECT * FROM config WHERE profileId = :profileId") fun getAllNow(profileId: Int): List + + @Query("DELETE FROM config WHERE profileId = :profileId") + fun clear(profileId: Int) } \ No newline at end of file diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/AppConfigMigrationV3.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/AppConfigMigrationV3.kt new file mode 100644 index 00000000..78a1d8a6 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/AppConfigMigrationV3.kt @@ -0,0 +1,96 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-19. + */ + +package pl.szczodrzynski.edziennik.config.utils + +import android.content.SharedPreferences +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import pl.szczodrzynski.edziennik.BuildConfig +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.config.Config +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_LIBRUS +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN +import pl.szczodrzynski.edziennik.utils.models.Time +import kotlin.math.abs + +class AppConfigMigrationV3(p: SharedPreferences, config: Config) { + init { config.apply { + val s = "app.appConfig" + if (dataVersion < 1) { + ui.theme = p.getString("$s.appTheme", null)?.toIntOrNull() ?: 1 + sync.enabled = p.getString("$s.registerSyncEnabled", null)?.toBoolean() ?: true + sync.interval = p.getString("$s.registerSyncInterval", null)?.toIntOrNull() ?: 3600 + val oldButtons = p.getString("$s.miniDrawerButtonIds", null)?.let { str -> + str.replace("[\\[\\]]*".toRegex(), "") + .split(",\\s?".toRegex()) + .mapNotNull { it.toIntOrNull() } + } + ui.miniMenuButtons = oldButtons ?: listOf( + MainActivity.DRAWER_ITEM_HOME, + MainActivity.DRAWER_ITEM_TIMETABLE, + MainActivity.DRAWER_ITEM_AGENDA, + MainActivity.DRAWER_ITEM_GRADES, + MainActivity.DRAWER_ITEM_MESSAGES, + MainActivity.DRAWER_ITEM_HOMEWORK, + MainActivity.DRAWER_ITEM_SETTINGS + ) + dataVersion = 1 + } + if (dataVersion < 2) { + devModePassword = p.getString("$s.devModePassword", null).fix() + sync.tokenApp = p.getString("$s.fcmToken", null).fix() + timetable.bellSyncMultiplier = p.getString("$s.bellSyncMultiplier", null)?.toIntOrNull() ?: 0 + appRateSnackbarTime = p.getString("$s.appRateSnackbarTime", null)?.toLongOrNull() ?: 0 + timetable.countInSeconds = p.getString("$s.countInSeconds", null)?.toBoolean() ?: false + ui.headerBackground = p.getString("$s.headerBackground", null).fix() + ui.appBackground = p.getString("$s.appBackground", null).fix() + ui.language = p.getString("$s.language", null).fix() + appVersion = p.getString("$s.lastAppVersion", null)?.toIntOrNull() ?: BuildConfig.VERSION_CODE + appInstalledTime = p.getString("$s.appInstalledTime", null)?.toLongOrNull() ?: 0 + grades.orderBy = p.getString("$s.gradesOrderBy", null)?.toIntOrNull() ?: 0 + sync.quietDuringLessons = p.getString("$s.quietDuringLessons", null)?.toBoolean() ?: false + ui.miniMenuVisible = p.getString("$s.miniDrawerVisible", null)?.toBoolean() ?: false + loginFinished = p.getString("$s.loginFinished", null)?.toBoolean() ?: false + sync.onlyWifi = p.getString("$s.registerSyncOnlyWifi", null)?.toBoolean() ?: false + sync.notifyAboutUpdates = p.getString("$s.notifyAboutUpdates", null)?.toBoolean() ?: true + timetable.bellSyncDiff = p.getString("$s.bellSyncDiff", null)?.let { Gson().fromJson(it, Time::class.java) } + + val startMillis = p.getString("$s.quietHoursStart", null)?.toLongOrNull() ?: 0 + val endMillis = p.getString("$s.quietHoursEnd", null)?.toLongOrNull() ?: 0 + if (startMillis > 0) { + try { + sync.quietHoursStart = Time.fromMillis(abs(startMillis)) + sync.quietHoursEnd = Time.fromMillis(abs(endMillis)) + sync.quietHoursEnabled = true + } + catch (_: Exception) {} + } + else { + sync.quietHoursEnabled = false + sync.quietHoursStart = null + sync.quietHoursEnd = null + } + + sync.tokenMobidziennikList = listOf() + sync.tokenVulcanList = listOf() + sync.tokenLibrusList = listOf() + val tokens = p.getString("$s.fcmTokens", null)?.let { Gson().fromJson>>>(it, object: TypeToken>>>(){}.type) } + tokens?.forEach { + val token = it.value.first + when (it.key) { + LOGIN_TYPE_MOBIDZIENNIK -> sync.tokenMobidziennik = token + LOGIN_TYPE_VULCAN -> sync.tokenVulcan = token + LOGIN_TYPE_LIBRUS -> sync.tokenLibrus = token + } + } + dataVersion = 2 + } + }} + + private fun String?.fix(): String? { + return this?.replace("\"", "")?.let { if (it == "null") null else it } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigExtensions.kt index aec5ebee..94bb87e6 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigExtensions.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigExtensions.kt @@ -37,6 +37,9 @@ fun AbstractConfig.set(key: String, value: JsonElement?) { fun AbstractConfig.set(key: String, value: List?) { set(key, value?.let { gson.toJson(it) }) } +fun AbstractConfig.set(key: String, value: Any?) { + set(key, value?.let { gson.toJson(it) }) +} fun AbstractConfig.setStringList(key: String, value: List?) { set(key, value?.let { gson.toJson(it) }) } @@ -46,6 +49,9 @@ fun AbstractConfig.setIntList(key: String, value: List?) { fun AbstractConfig.setLongList(key: String, value: List?) { set(key, value?.let { gson.toJson(it) }) } +fun AbstractConfig.setMap(key: String, value: Map?) { + set(key, value?.let { gson.toJson(it) }) +} fun HashMap.get(key: String, default: String?): String? { return this[key] ?: default @@ -53,6 +59,9 @@ fun HashMap.get(key: String, default: String?): String? { fun HashMap.get(key: String, default: Boolean): Boolean { return this[key]?.toBoolean() ?: default } +fun HashMap.getBooleanOrNull(key: String): Boolean? { + return this[key]?.toBooleanStrictOrNull() +} fun HashMap.get(key: String, default: Int): Int { return this[key]?.toIntOrNull() ?: default } @@ -74,6 +83,9 @@ fun HashMap.get(key: String, default: JsonObject?): JsonObject? fun HashMap.get(key: String, default: JsonArray?): JsonArray? { return this[key]?.let { JsonParser().parse(it)?.asJsonArray } ?: default } +inline fun HashMap.get(key: String, default: T?): T? { + return this[key]?.let { Gson().fromJson(it, T::class.java) } ?: default +} /* !!! cannot use mutable list here - modifying it will not update the DB */ fun HashMap.get(key: String, default: List?, classOfT: Class): List? { return this[key]?.let { ConfigGsonUtils().deserializeList(gson, it, classOfT) } ?: default @@ -88,10 +100,14 @@ fun HashMap.getLongList(key: String, default: List?): Lis return this[key]?.let { gson.fromJson>(it, object: TypeToken>(){}.type) } ?: default } +fun HashMap.getFloat(key: String): Float? { + return this[key]?.toFloatOrNull() +} + fun List.toHashMap(profileId: Int, map: HashMap) { map.clear() forEach { if (it.profileId == profileId) map[it.key] = it.value } -} \ No newline at end of file +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt index 4ed95f6f..58dc35f7 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ConfigMigration.kt @@ -5,32 +5,34 @@ package pl.szczodrzynski.edziennik.config.utils import android.content.Context -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.BuildConfig +import pl.szczodrzynski.edziennik.HOUR import pl.szczodrzynski.edziennik.MainActivity -import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_LIBRUS -import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK -import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN import pl.szczodrzynski.edziennik.config.Config +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.ORDER_BY_DATE_DESC import pl.szczodrzynski.edziennik.utils.models.Time +import kotlin.math.abs class ConfigMigration(app: App, config: Config) { init { config.apply { - val p = app.getSharedPreferences("pl.szczodrzynski.edziennik_profiles", Context.MODE_PRIVATE) - val s = "app.appConfig" - if (dataVersion < 1) { - ui.theme = p.getString("$s.appTheme", null)?.toIntOrNull() ?: 1 - sync.enabled = p.getString("$s.registerSyncEnabled", null)?.toBoolean() ?: true - sync.interval = p.getString("$s.registerSyncEnabled", null)?.toIntOrNull() ?: 3600 - val oldButtons = p.getString("$s.miniDrawerButtonIds", null)?.let { str -> - str.replace("[\\[\\]]*".toRegex(), "") - .split(",\\s?".toRegex()) - .mapNotNull { it.toIntOrNull() } - } - ui.miniMenuButtons = oldButtons ?: listOf( + val p = app.getSharedPreferences("pl.szczodrzynski.edziennik_profiles", Context.MODE_PRIVATE) + if (p.contains("app.appConfig.appTheme")) { + // migrate appConfig from app version 3.x and lower. + // Updates dataVersion to level 2. + AppConfigMigrationV3(p, config) + } + + if (dataVersion < 2) { + appVersion = BuildConfig.VERSION_CODE + loginFinished = false + ui.language = null + ui.theme = 1 + ui.appBackground = null + ui.headerBackground = null + ui.miniMenuVisible = false + ui.miniMenuButtons = listOf( MainActivity.DRAWER_ITEM_HOME, MainActivity.DRAWER_ITEM_TIMETABLE, MainActivity.DRAWER_ITEM_AGENDA, @@ -39,46 +41,70 @@ class ConfigMigration(app: App, config: Config) { MainActivity.DRAWER_ITEM_HOMEWORK, MainActivity.DRAWER_ITEM_SETTINGS ) - dataVersion = 1 - } - if (dataVersion < 2) { - devModePassword = p.getString("$s.devModePassword", null).fix() - sync.tokenApp = p.getString("$s.fcmToken", null).fix() - timetable.bellSyncMultiplier = p.getString("$s.bellSyncMultiplier", null)?.toIntOrNull() ?: 0 - sync.quietHoursStart = p.getString("$s.quietHoursStart", null)?.toLongOrNull() ?: 0 - appRateSnackbarTime = p.getString("$s.appRateSnackbarTime", null)?.toLongOrNull() ?: 0 - sync.quietHoursEnd = p.getString("$s.quietHoursEnd", null)?.toLongOrNull() ?: 0 - timetable.countInSeconds = p.getString("$s.countInSeconds", null)?.toBoolean() ?: false - ui.headerBackground = p.getString("$s.headerBackground", null).fix() - ui.appBackground = p.getString("$s.appBackground", null).fix() - ui.language = p.getString("$s.language", null).fix() - appVersion = p.getString("$s.lastAppVersion", null)?.toIntOrNull() ?: BuildConfig.VERSION_CODE - appInstalledTime = p.getString("$s.appInstalledTime", null)?.toLongOrNull() ?: 0 - grades.orderBy = p.getString("$s.gradesOrderBy", null)?.toIntOrNull() ?: 0 - sync.quietDuringLessons = p.getString("$s.quietDuringLessons", null)?.toBoolean() ?: false - ui.miniMenuVisible = p.getString("$s.miniDrawerVisible", null)?.toBoolean() ?: false - loginFinished = p.getString("$s.loginFinished", null)?.toBoolean() ?: false - sync.onlyWifi = p.getString("$s.registerSyncOnlyWifi", null)?.toBoolean() ?: false - sync.notifyAboutUpdates = p.getString("$s.notifyAboutUpdates", null)?.toBoolean() ?: true - timetable.bellSyncDiff = p.getString("$s.bellSyncDiff", null)?.let { Gson().fromJson(it, Time::class.java) } - + sync.enabled = true + sync.interval = 1*HOUR.toInt() + sync.notifyAboutUpdates = true + sync.onlyWifi = false + sync.quietHoursEnabled = false + sync.quietHoursStart = null + sync.quietHoursEnd = null + sync.quietDuringLessons = false + sync.tokenApp = null + sync.tokenMobidziennik = null sync.tokenMobidziennikList = listOf() - sync.tokenVulcanList = listOf() + sync.tokenLibrus = null sync.tokenLibrusList = listOf() - val tokens = p.getString("$s.fcmTokens", null)?.let { Gson().fromJson>>>(it, object: TypeToken>>>(){}.type) } - tokens?.forEach { - val token = it.value.first - when (it.key) { - LOGIN_TYPE_MOBIDZIENNIK -> sync.tokenMobidziennik = token - LOGIN_TYPE_VULCAN -> sync.tokenVulcan = token - LOGIN_TYPE_LIBRUS -> sync.tokenLibrus = token - } - } + sync.tokenVulcan = null + sync.tokenVulcanList = listOf() + timetable.bellSyncMultiplier = 0 + timetable.bellSyncDiff = null + timetable.countInSeconds = false + grades.orderBy = ORDER_BY_DATE_DESC + dataVersion = 2 } - }} - private fun String?.fix(): String? { - return this?.replace("\"", "")?.let { if (it == "null") null else it } - } + if (dataVersion < 3) { + update = null + privacyPolicyAccepted = false + devMode = null + devModePassword = null + appInstalledTime = 0L + appRateSnackbarTime = 0L + + dataVersion = 3 + } + + if (dataVersion < 10) { + ui.openDrawerOnBackPressed = false + ui.snowfall = false + ui.bottomSheetOpened = false + sync.dontShowAppManagerDialog = false + sync.webPushEnabled = true + sync.lastAppSync = 0L + + + dataVersion = 10 + } + + if (dataVersion < 11) { + val startMillis = config.values.get("quietHoursStart", 0L) + val endMillis = config.values.get("quietHoursEnd", 0L) + if (startMillis > 0) { + try { + sync.quietHoursStart = Time.fromMillis(abs(startMillis)) + sync.quietHoursEnd = Time.fromMillis(abs(endMillis)) + sync.quietHoursEnabled = true + } + catch (_: Exception) {} + } + else { + sync.quietHoursEnabled = false + sync.quietHoursStart = null + sync.quietHoursEnd = null + } + + dataVersion = 11 + } + }} } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt index 31c4dbc3..17f071f2 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/config/utils/ProfileConfigMigration.kt @@ -4,23 +4,34 @@ package pl.szczodrzynski.edziennik.config.utils -import android.content.Context -import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.config.Config +import pl.szczodrzynski.edziennik.config.ProfileConfig +import pl.szczodrzynski.edziennik.data.db.entity.Notification +import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.AGENDA_DEFAULT +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.COLOR_MODE_WEIGHTED +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_ALL_GRADES -class ProfileConfigMigration(app: App, config: Config) { +class ProfileConfigMigration(config: ProfileConfig) { init { config.apply { - val p = app.getSharedPreferences("pl.szczodrzynski.edziennik_profiles", Context.MODE_PRIVATE) - val s = "app.appConfig" if (dataVersion < 1) { + grades.colorMode = COLOR_MODE_WEIGHTED + grades.yearAverageMode = YEAR_ALL_GRADES + grades.hideImproved = false + grades.averageWithoutWeight = true + grades.plusValue = null + grades.minusValue = null + grades.dontCountEnabled = false + grades.dontCountGrades = listOf() + ui.agendaViewType = AGENDA_DEFAULT + // no migration for ui.homeCards - //dataVersion = 1 + dataVersion = 1 } + if (dataVersion < 2) { - //gradesColorMode do profilu ! - //agendaViewType do profilu ! - // app.appConfig.dontCountZeroToAverage do profilu ! + sync.notificationFilter = sync.notificationFilter + Notification.TYPE_TEACHER_ABSENCE + + dataVersion = 2 } }} -} \ No newline at end of file +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt index ae0e7a18..ad9c4296 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/ApiService.kt @@ -12,13 +12,17 @@ import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask import pl.szczodrzynski.edziennik.data.api.events.* import pl.szczodrzynski.edziennik.data.api.events.requests.ServiceCloseRequest import pl.szczodrzynski.edziennik.data.api.events.requests.TaskCancelRequest import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.api.task.* -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull +import pl.szczodrzynski.edziennik.data.api.task.ErrorReportTask +import pl.szczodrzynski.edziennik.data.api.task.IApiTask +import pl.szczodrzynski.edziennik.data.api.task.SzkolnyTask +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.toApiError import pl.szczodrzynski.edziennik.utils.Utils.d import kotlin.math.min import kotlin.math.roundToInt @@ -26,7 +30,7 @@ import kotlin.math.roundToInt class ApiService : Service() { companion object { const val TAG = "ApiService" - const val NOTIFICATION_API_CHANNEL_ID = "pl.szczodrzynski.edziennik.GET_DATA" + const val NOTIFICATION_API_CHANNEL_ID = "pl.szczodrzynski.edziennik.SYNC" fun start(context: Context) { context.startService(Intent(context, ApiService::class.java)) } @@ -34,34 +38,34 @@ class ApiService : Service() { context.startService(Intent(context, ApiService::class.java)) EventBus.getDefault().postSticky(request) } + + var lastEventTime = System.currentTimeMillis() + var taskCancelTries = 0 } private val app by lazy { applicationContext as App } - private val syncingProfiles = mutableListOf() + private val syncingProfiles = mutableListOf() - private val finishingTaskQueue = mutableListOf( - SzkolnyTask.sync(syncingProfiles), - NotifyTask() - ) + private var szkolnyTaskFinished = false + private val allTaskRequestList = mutableListOf() private val taskQueue = mutableListOf() private val errorList = mutableListOf() private var serviceClosed = false + set(value) { field = value; notification.serviceClosed = value } private var taskCancelled = false private var taskIsRunning = false private var taskRunning: IApiTask? = null // for debug purposes private var taskRunningId = -1 + private var taskStartTime = 0L private var taskMaximumId = 0 private var taskProfileId = -1 private var taskProgress = -1f private var taskProgressText: String? = null - private val notification by lazy { EdziennikNotification(this) } - - private var lastEventTime = System.currentTimeMillis() - private var taskCancelTries = 0 + private val notification by lazy { EdziennikNotification(app) } /* ______ _ _ _ _ _____ _ _ _ _ | ____| | | (_) (_) | / ____| | | | | | | @@ -72,8 +76,8 @@ class ApiService : Service() { private val taskCallback = object : EdziennikCallback { override fun onCompleted() { lastEventTime = System.currentTimeMillis() - d(TAG, "Task $taskRunningId (profile $taskProfileId) - $taskProgressText - finished") - EventBus.getDefault().post(ApiTaskFinishedEvent(taskProfileId)) + d(TAG, "Task $taskRunningId (profile $taskProfileId) finished in ${System.currentTimeMillis()-taskStartTime}") + EventBus.getDefault().postSticky(ApiTaskFinishedEvent(taskProfileId)) clearTask() notification.setIdle().post() @@ -84,9 +88,16 @@ class ApiService : Service() { lastEventTime = System.currentTimeMillis() d(TAG, "Task $taskRunningId threw an error - $apiError") apiError.profileId = taskProfileId - EventBus.getDefault().post(ApiTaskErrorEvent(apiError)) - errorList.add(apiError) - apiError.throwable?.printStackTrace() + + if (app.userActionManager.requiresUserAction(apiError)) { + app.userActionManager.sendToUser(apiError) + } + else { + EventBus.getDefault().postSticky(ApiTaskErrorEvent(apiError)) + errorList.add(apiError) + apiError.throwable?.printStackTrace() + } + if (apiError.isCritical) { taskRunning?.cancel() notification.setCriticalError().post() @@ -130,15 +141,20 @@ class ApiService : Service() { checkIfTaskFrozen() if (taskIsRunning) return - if (taskCancelled || serviceClosed || (taskQueue.isEmpty() && finishingTaskQueue.isEmpty())) { - serviceClosed = false + if (taskCancelled || serviceClosed || (taskQueue.isEmpty() && szkolnyTaskFinished)) { allCompleted() return } lastEventTime = System.currentTimeMillis() - val task = if (taskQueue.isEmpty()) finishingTaskQueue.removeAt(0) else taskQueue.removeAt(0) + val task = if (taskQueue.isNotEmpty()) { + taskQueue.removeAt(0) + } else { + szkolnyTaskFinished = true + SzkolnyTask(app, syncingProfiles) + } + task.taskId = ++taskMaximumId task.prepare(app) taskIsRunning = true @@ -148,7 +164,7 @@ class ApiService : Service() { taskProgress = -1f taskProgressText = task.taskName - d(TAG, "Executing task $taskRunningId ($taskProgressText) - $task") + d(TAG, "Executing task $taskRunningId - ${task::class.java.name}") // update the notification notification.setCurrentTask(taskRunningId, taskProgressText).post() @@ -158,15 +174,15 @@ class ApiService : Service() { task.profile?.let { syncingProfiles.add(it) } + taskStartTime = System.currentTimeMillis() try { when (task) { is EdziennikTask -> task.run(app, taskCallback) - is NotifyTask -> task.run(app, taskCallback) is ErrorReportTask -> task.run(app, taskCallback, notification, errorList) - is SzkolnyTask -> task.run(app, taskCallback) + is SzkolnyTask -> task.run(taskCallback) } } catch (e: Exception) { - taskCallback.onError(ApiError(TAG, EXCEPTION_API_TASK).withThrowable(e)) + taskCallback.onError(e.toApiError(TAG)) } } @@ -194,7 +210,7 @@ class ApiService : Service() { */ private fun stopIfTaskFrozen() { if (checkIfTaskFrozen()) { - stopSelf() + allCompleted() } } @@ -213,7 +229,8 @@ class ApiService : Service() { } private fun allCompleted() { - EventBus.getDefault().post(ApiTaskAllFinishedEvent()) + serviceClosed = true + EventBus.getDefault().postSticky(ApiTaskAllFinishedEvent()) stopSelf() } @@ -228,6 +245,13 @@ class ApiService : Service() { EventBus.getDefault().removeStickyEvent(task) d(TAG, task.toString()) + if (task is EdziennikTask) { + // fix for duplicated tasks, thank you EventBus + if (task.request in allTaskRequestList) + return + allTaskRequestList += task.request + } + if (task is EdziennikTask) { when (task.request) { is EdziennikTask.SyncRequest -> app.db.profileDao().idsForSyncNow.forEach { @@ -270,7 +294,7 @@ class ApiService : Service() { serviceClosed = true taskCancelled = true taskRunning?.cancel() - stopSelf() + allCompleted() } /* _____ _ _ _ @@ -287,11 +311,13 @@ class ApiService : Service() { override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { d(TAG, "Foreground service onStartCommand") - startForeground(EdziennikNotification.NOTIFICATION_ID, notification.notification) + startForeground(app.notificationChannelsManager.sync.id, notification.notification) return START_NOT_STICKY } override fun onDestroy() { + d(TAG, "Service destroyed") + serviceClosed = true EventBus.getDefault().unregister(this) } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt index d8bd5c8b..cb0d5a06 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Constants.kt @@ -14,24 +14,24 @@ val SYSTEM_USER_AGENT = System.getProperty("http.agent") ?: "Dalvik/2.1.0 Androi val SERVER_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME} $SYSTEM_USER_AGENT" -const val FAKE_LIBRUS_API = "http://librus.szkolny.eu/api" -const val FAKE_LIBRUS_PORTAL = "http://librus.szkolny.eu" -const val FAKE_LIBRUS_AUTHORIZE = "http://librus.szkolny.eu/authorize.php" -const val FAKE_LIBRUS_LOGIN = "http://librus.szkolny.eu/login_action.php" -const val FAKE_LIBRUS_TOKEN = "http://librus.szkolny.eu/access_token.php" +const val FAKE_LIBRUS_API = "https://librus.szkolny.eu/api" +const val FAKE_LIBRUS_PORTAL = "https://librus.szkolny.eu" +const val FAKE_LIBRUS_AUTHORIZE = "https://librus.szkolny.eu/authorize.php" +const val FAKE_LIBRUS_LOGIN = "https://librus.szkolny.eu/login_action.php" +const val FAKE_LIBRUS_TOKEN = "https://librus.szkolny.eu/access_token.php" const val FAKE_LIBRUS_ACCOUNT = "/synergia_accounts_fresh.php?login=" const val FAKE_LIBRUS_ACCOUNTS = "/synergia_accounts.php" -val LIBRUS_USER_AGENT = "$SYSTEM_USER_AGENT LibrusMobileApp" +val LIBRUS_USER_AGENT = "${SYSTEM_USER_AGENT}LibrusMobileApp" const val SYNERGIA_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Gecko/20100101 Firefox/62.0" -const val LIBRUS_CLIENT_ID = "wmSyUMo8llDAs4y9tJVYY92oyZ6h4lAt7KCuy0Gv" -const val LIBRUS_REDIRECT_URL = "http://localhost/bar" +const val LIBRUS_CLIENT_ID = "VaItV6oRutdo8fnjJwysnTjVlvaswf52ZqmXsJGP" +const val LIBRUS_REDIRECT_URL = "app://librus" const val LIBRUS_AUTHORIZE_URL = "https://portal.librus.pl/oauth2/authorize?client_id=$LIBRUS_CLIENT_ID&redirect_uri=$LIBRUS_REDIRECT_URL&response_type=code" const val LIBRUS_LOGIN_URL = "https://portal.librus.pl/rodzina/login/action" const val LIBRUS_TOKEN_URL = "https://portal.librus.pl/oauth2/access_token" -const val LIBRUS_ACCOUNT_URL = "/v2/SynergiaAccounts/fresh/" // + login -const val LIBRUS_ACCOUNTS_URL = "/v2/SynergiaAccounts" +const val LIBRUS_ACCOUNT_URL = "/v3/SynergiaAccounts/fresh/" // + login +const val LIBRUS_ACCOUNTS_URL = "/v3/SynergiaAccounts" /** https://api.librus.pl/2.0 */ const val LIBRUS_API_URL = "https://api.librus.pl/2.0" @@ -43,7 +43,7 @@ const val LIBRUS_API_TOKEN_URL = "https://api.librus.pl/OAuth/Token" const val LIBRUS_API_TOKEN_JST_URL = "https://api.librus.pl/OAuth/TokenJST" const val LIBRUS_API_AUTHORIZATION = "Mjg6ODRmZGQzYTg3YjAzZDNlYTZmZmU3NzdiNThiMzMyYjE=" const val LIBRUS_API_SECRET_JST = "18b7c1ee08216f636a1b1a2440e68398" -const val LIBRUS_API_CLIENT_ID_JST = "49" +const val LIBRUS_API_CLIENT_ID_JST = "59" //const val LIBRUS_API_CLIENT_ID_JST_REFRESH = "42" const val LIBRUS_JST_DEMO_CODE = "68656A21" @@ -56,10 +56,14 @@ const val LIBRUS_SYNERGIA_TOKEN_LOGIN_URL = "https://synergia.librus.pl/loguj/to const val LIBRUS_MESSAGES_URL = "https://wiadomosci.librus.pl/module" const val LIBRUS_SANDBOX_URL = "https://sandbox.librus.pl/index.php?action=" +const val LIBRUS_SYNERGIA_HOMEWORK_ATTACHMENT_URL = "https://synergia.librus.pl/homework/downloadFile" +const val LIBRUS_SYNERGIA_MESSAGES_ATTACHMENT_URL = "https://synergia.librus.pl/wiadomosci/pobierz_zalacznik" + const val IDZIENNIK_USER_AGENT = SYNERGIA_USER_AGENT const val IDZIENNIK_WEB_URL = "https://iuczniowie.progman.pl/idziennik" const val IDZIENNIK_WEB_LOGIN = "login.aspx" const val IDZIENNIK_WEB_SETTINGS = "mod_panelRodzica/Ustawienia.aspx" +const val IDZIENNIK_WEB_HOME = "mod_panelRodzica/StronaGlowna.aspx" const val IDZIENNIK_WEB_TIMETABLE = "mod_panelRodzica/plan/WS_Plan.asmx/pobierzPlanZajec" const val IDZIENNIK_WEB_GRADES = "mod_panelRodzica/oceny/WS_ocenyUcznia.asmx/pobierzOcenyUcznia" const val IDZIENNIK_WEB_MISSING_GRADES = "mod_panelRodzica/brak_ocen/WS_BrakOcenUcznia.asmx/pobierzBrakujaceOcenyUcznia" @@ -69,6 +73,12 @@ const val IDZIENNIK_WEB_NOTICES = "mod_panelRodzica/uwagi/WS_uwagiUcznia.asmx/po const val IDZIENNIK_WEB_ATTENDANCE = "mod_panelRodzica/obecnosci/WS_obecnosciUcznia.asmx/pobierzObecnosciUcznia" const val IDZIENNIK_WEB_ANNOUNCEMENTS = "mod_panelRodzica/tabOgl/WS_tablicaOgloszen.asmx/GetOgloszenia" const val IDZIENNIK_WEB_MESSAGES_LIST = "mod_komunikator/WS_wiadomosci.asmx/PobierzListeWiadomosci" +const val IDZIENNIK_WEB_GET_MESSAGE = "mod_komunikator/WS_wiadomosci.asmx/PobierzWiadomosc" +const val IDZIENNIK_WEB_GET_RECIPIENT_LIST = "mod_komunikator/WS_wiadomosci.asmx/pobierzListeOdbiorcowPanelRodzic" +const val IDZIENNIK_WEB_SEND_MESSAGE = "mod_komunikator/WS_wiadomosci.asmx/WyslijWiadomosc" +const val IDZIENNIK_WEB_GET_ATTACHMENT = "mod_komunikator/Download.ashx" +const val IDZIENNIK_WEB_GET_HOMEWORK = "mod_panelRodzica/pracaDomowa/WS_pracaDomowa.asmx/pobierzJednaPraceDomowa" +const val IDZIENNIK_WEB_GET_HOMEWORK_ATTACHMENT = "mod_panelRodzica/pracaDomowa.aspx" val IDZIENNIK_API_USER_AGENT = SYSTEM_USER_AGENT const val IDZIENNIK_API_URL = "https://iuczniowie.progman.pl/idziennik/api" @@ -80,24 +90,39 @@ const val IDZIENNIK_API_MESSAGES_SENT = "Wiadomosci/Wyslane" val MOBIDZIENNIK_USER_AGENT = SYSTEM_USER_AGENT -const val VULCAN_API_USER_AGENT = "MobileUserAgent" -const val VULCAN_API_APP_NAME = "VULCAN-Android-ModulUcznia" -const val VULCAN_API_APP_VERSION = "19.4.1.436" -const val VULCAN_API_PASSWORD = "CE75EA598C7743AD9B0B7328DED85B06" -const val VULCAN_API_PASSWORD_FAKELOG = "012345678901234567890123456789AB" -val VULCAN_API_DEVICE_NAME = "Szkolny.eu ${Build.MODEL}" +const val VULCAN_HEBE_USER_AGENT = "Dart/2.10 (dart:io)" +const val VULCAN_HEBE_APP_NAME = "DzienniczekPlus 2.0" +const val VULCAN_HEBE_APP_VERSION = "21.02.09 (G)" +private const val VULCAN_API_DEVICE_NAME_PREFIX = "Szkolny.eu " +private const val VULCAN_API_DEVICE_NAME_SUFFIX = " - nie usuwać" +val VULCAN_API_DEVICE_NAME by lazy { + val base = "$VULCAN_API_DEVICE_NAME_PREFIX${Build.MODEL}" + val baseMaxLength = 50 - VULCAN_API_DEVICE_NAME_SUFFIX.length + base.take(baseMaxLength) + VULCAN_API_DEVICE_NAME_SUFFIX +} -const val VULCAN_API_ENDPOINT_CERTIFICATE = "mobile-api/Uczen.v3.UczenStart/Certyfikat" -const val VULCAN_API_ENDPOINT_STUDENT_LIST = "mobile-api/Uczen.v3.UczenStart/ListaUczniow" -const val VULCAN_API_ENDPOINT_DICTIONARIES = "mobile-api/Uczen.v3.Uczen/Slowniki" -const val VULCAN_API_ENDPOINT_TIMETABLE = "mobile-api/Uczen.v3.Uczen/PlanLekcjiZeZmianami" -const val VULCAN_API_ENDPOINT_GRADES = "mobile-api/Uczen.v3.Uczen/Oceny" -const val VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS = "mobile-api/Uczen.v3.Uczen/OcenyPodsumowanie" -const val VULCAN_API_ENDPOINT_EVENTS = "mobile-api/Uczen.v3.Uczen/Sprawdziany" -const val VULCAN_API_ENDPOINT_HOMEWORK = "mobile-api/Uczen.v3.Uczen/ZadaniaDomowe" -const val VULCAN_API_ENDPOINT_NOTICES = "mobile-api/Uczen.v3.Uczen/UwagiUcznia" -const val VULCAN_API_ENDPOINT_ATTENDANCE = "mobile-api/Uczen.v3.Uczen/Frekwencje" -const val VULCAN_API_ENDPOINT_MESSAGES_RECEIVED = "mobile-api/Uczen.v3.Uczen/WiadomosciOdebrane" -const val VULCAN_API_ENDPOINT_MESSAGES_SENT = "mobile-api/Uczen.v3.Uczen/WiadomosciWyslane" -const val VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS = "mobile-api/Uczen.v3.Uczen/ZmienStatusWiadomosci" -const val VULCAN_API_ENDPOINT_PUSH = "mobile-api/Uczen.v3.Uczen/UstawPushToken" +const val VULCAN_WEB_ENDPOINT_LUCKY_NUMBER = "Start.mvc/GetKidsLuckyNumbers" +const val VULCAN_WEB_ENDPOINT_REGISTER_DEVICE = "RejestracjaUrzadzeniaToken.mvc/Get" +const val VULCAN_HEBE_ENDPOINT_REGISTER_NEW = "api/mobile/register/new" +const val VULCAN_HEBE_ENDPOINT_MAIN = "api/mobile/register/hebe" +const val VULCAN_HEBE_ENDPOINT_PUSH_ALL = "api/mobile/push/all" +const val VULCAN_HEBE_ENDPOINT_TIMETABLE = "api/mobile/schedule" +const val VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES = "api/mobile/schedule/changes" +const val VULCAN_HEBE_ENDPOINT_ADDRESSBOOK = "api/mobile/addressbook" +const val VULCAN_HEBE_ENDPOINT_EXAMS = "api/mobile/exam" +const val VULCAN_HEBE_ENDPOINT_GRADES = "api/mobile/grade" +const val VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY = "api/mobile/grade/summary" +const val VULCAN_HEBE_ENDPOINT_HOMEWORK = "api/mobile/homework" +const val VULCAN_HEBE_ENDPOINT_NOTICES = "api/mobile/note" +const val VULCAN_HEBE_ENDPOINT_ATTENDANCE = "api/mobile/lesson" +const val VULCAN_HEBE_ENDPOINT_MESSAGES = "api/mobile/message" +const val VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS = "api/mobile/message/status" +const val VULCAN_HEBE_ENDPOINT_MESSAGES_SEND = "api/mobile/message" +const val VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER = "api/mobile/school/lucky" + +const val EDUDZIENNIK_USER_AGENT = "Szkolny.eu/${BuildConfig.VERSION_NAME}" + +const val PODLASIE_API_VERSION = "1.0.62" +const val PODLASIE_API_URL = "https://cpdklaser.zeto.bialystok.pl/api" +const val PODLASIE_API_USER_ENDPOINT = "/pobierzDaneUcznia" +const val PODLASIE_API_LOGOUT_DEVICES_ENDPOINT = "/wyczyscUrzadzenia" diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/DataNotifications.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/DataNotifications.kt deleted file mode 100644 index 18583986..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/DataNotifications.kt +++ /dev/null @@ -1,210 +0,0 @@ -package pl.szczodrzynski.edziennik.data.api - -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE -import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.api.models.Data -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.* -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_LUCKY_NUMBER -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_ANNOUNCEMENT -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_ATTENDANCE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_EVENT -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_GRADE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_HOMEWORK -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_MESSAGE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_NOTICE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_TIMETABLE_LESSON_CHANGE -import pl.szczodrzynski.edziennik.data.db.modules.notification.getNotificationTitle -import pl.szczodrzynski.edziennik.utils.models.Date - -class DataNotifications(val data: Data) { - companion object { - private const val TAG = "DataNotifications" - } - - val app = data.app - val profileId = data.profile?.id ?: -1 - val profileName = data.profile?.name ?: "" - val profile = data.profile - val loginStore = data.loginStore - - init { run { - if (profile == null) { - return@run - } - - for (lesson in app.db.timetableDao().getNotNotifiedNow(profileId)) { - val text = app.getString(R.string.notification_lesson_change_format, lesson.getDisplayChangeType(app), if (lesson.displayDate == null) "" else lesson.displayDate!!.formattedString, lesson.changeSubjectName) - data.notifications += Notification( - title = app.getNotificationTitle(TYPE_TIMETABLE_LESSON_CHANGE), - text = text, - type = TYPE_TIMETABLE_LESSON_CHANGE, - profileId = profileId, - profileName = profileName, - viewId = DRAWER_ITEM_TIMETABLE, - addedDate = lesson.addedDate - ).addExtra("timetableDate", lesson.displayDate?.stringY_m_d ?: "") - } - - for (event in app.db.eventDao().getNotNotifiedNow(profileId)) { - val text = if (event.type == Event.TYPE_HOMEWORK) - app.getString( - if (event.subjectLongName.isNullOrEmpty()) - R.string.notification_homework_no_subject_format - else - R.string.notification_homework_format, - event.subjectLongName, - event.eventDate.formattedString - ) - else - app.getString( - if (event.subjectLongName.isNullOrEmpty()) - R.string.notification_event_no_subject_format - else - R.string.notification_event_format, - event.typeName, - event.eventDate.formattedString, - event.subjectLongName - ) - val type = if (event.type == Event.TYPE_HOMEWORK) TYPE_NEW_HOMEWORK else TYPE_NEW_EVENT - data.notifications += Notification( - title = app.getNotificationTitle(type), - text = text, - type = type, - profileId = profileId, - profileName = profileName, - viewId = if (event.type == Event.TYPE_HOMEWORK) DRAWER_ITEM_HOMEWORK else DRAWER_ITEM_AGENDA, - addedDate = event.addedDate - ).addExtra("eventId", event.id).addExtra("eventDate", event.eventDate.value.toLong()) - } - - val today = Date.getToday() - val todayValue = today.value - profile.currentSemester = profile.dateToSemester(today) - - for (grade in app.db.gradeDao().getNotNotifiedNow(profileId)) { - val gradeName = when (grade.type) { - TYPE_SEMESTER1_PROPOSED, TYPE_SEMESTER2_PROPOSED -> app.getString(R.string.grade_semester_proposed_format_2, grade.name) - TYPE_SEMESTER1_FINAL, TYPE_SEMESTER2_FINAL -> app.getString(R.string.grade_semester_final_format_2, grade.name) - TYPE_YEAR_PROPOSED -> app.getString(R.string.grade_year_proposed_format_2, grade.name) - TYPE_YEAR_FINAL -> app.getString(R.string.grade_year_final_format_2, grade.name) - else -> grade.name - } - val text = app.getString(R.string.notification_grade_format, gradeName, grade.subjectLongName) - data.notifications += Notification( - title = app.getNotificationTitle(TYPE_NEW_GRADE), - text = text, - type = TYPE_NEW_GRADE, - profileId = profileId, - profileName = profileName, - viewId = DRAWER_ITEM_GRADES, - addedDate = grade.addedDate - ).addExtra("gradeId", grade.id).addExtra("gradesSubjectId", grade.subjectId) - } - - for (notice in app.db.noticeDao().getNotNotifiedNow(profileId)) { - val noticeTypeStr = if (notice.type == Notice.TYPE_POSITIVE) app.getString(R.string.notification_notice_praise) else if (notice.type == Notice.TYPE_NEGATIVE) app.getString(R.string.notification_notice_warning) else app.getString(R.string.notification_notice_new) - val text = app.getString(R.string.notification_notice_format, noticeTypeStr, notice.teacherFullName, Date.fromMillis(notice.addedDate).formattedString) - data.notifications += Notification( - title = app.getNotificationTitle(TYPE_NEW_NOTICE), - text = text, - type = TYPE_NEW_NOTICE, - profileId = profileId, - profileName = profileName, - viewId = DRAWER_ITEM_BEHAVIOUR, - addedDate = notice.addedDate - ).addExtra("noticeId", notice.id) - } - - for (attendance in app.db.attendanceDao().getNotNotifiedNow(profileId)) { - var attendanceTypeStr = app.getString(R.string.notification_type_attendance) - when (attendance.type) { - Attendance.TYPE_ABSENT -> attendanceTypeStr = app.getString(R.string.notification_absence) - Attendance.TYPE_ABSENT_EXCUSED -> attendanceTypeStr = app.getString(R.string.notification_absence_excused) - Attendance.TYPE_BELATED -> attendanceTypeStr = app.getString(R.string.notification_belated) - Attendance.TYPE_BELATED_EXCUSED -> attendanceTypeStr = app.getString(R.string.notification_belated_excused) - Attendance.TYPE_RELEASED -> attendanceTypeStr = app.getString(R.string.notification_release) - } - val text = app.getString( - if (attendance.subjectLongName.isNullOrEmpty()) - R.string.notification_attendance_no_lesson_format - else - R.string.notification_attendance_format, - attendanceTypeStr, - attendance.subjectLongName, - attendance.lessonDate.formattedString - ) - data.notifications += Notification( - title = app.getNotificationTitle(TYPE_NEW_ATTENDANCE), - text = text, - type = TYPE_NEW_ATTENDANCE, - profileId = profileId, - profileName = profileName, - viewId = DRAWER_ITEM_ATTENDANCE, - addedDate = attendance.addedDate - ).addExtra("attendanceId", attendance.id).addExtra("attendanceSubjectId", attendance.subjectId) - } - - for (announcement in app.db.announcementDao().getNotNotifiedNow(profileId)) { - val text = app.context.getString(R.string.notification_announcement_format, announcement.subject) - data.notifications += Notification( - title = app.getNotificationTitle(TYPE_NEW_ANNOUNCEMENT), - text = text, - type = TYPE_NEW_ANNOUNCEMENT, - profileId = profileId, - profileName = profileName, - viewId = DRAWER_ITEM_ANNOUNCEMENTS, - addedDate = announcement.addedDate - ).addExtra("announcementId", announcement.id) - } - - for (message in app.db.messageDao().getReceivedNotNotifiedNow(profileId)) { - val text = app.context.getString(R.string.notification_message_format, message.senderFullName, message.subject) - data.notifications += Notification( - title = app.getNotificationTitle(TYPE_NEW_MESSAGE), - text = text, - type = TYPE_NEW_MESSAGE, - profileId = profileId, - profileName = profileName, - viewId = DRAWER_ITEM_MESSAGES, - addedDate = message.addedDate - ).addExtra("messageType", Message.TYPE_RECEIVED.toLong()).addExtra("messageId", message.id) - } - - val luckyNumbers = app.db.luckyNumberDao().getNotNotifiedNow(profileId) - luckyNumbers?.removeAll { it.date < today } - luckyNumbers?.forEach { luckyNumber -> - val text = when (luckyNumber.date.value) { - todayValue -> // LN for today - app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_format else R.string.notification_lucky_number_format, luckyNumber.number) - todayValue + 1 -> // LN for tomorrow - app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_tomorrow_format else R.string.notification_lucky_number_tomorrow_format, luckyNumber.number) - else -> // LN for later - app.getString(if (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) R.string.notification_lucky_number_yours_later_format else R.string.notification_lucky_number_later_format, luckyNumber.date.formattedString, luckyNumber.number) - } - data.notifications += Notification( - title = app.getNotificationTitle(TYPE_LUCKY_NUMBER), - text = text, - type = TYPE_LUCKY_NUMBER, - profileId = profileId, - profileName = profileName, - viewId = DRAWER_ITEM_HOME, - addedDate = luckyNumber.addedDate - ) - } - - data.db.metadataDao().setAllNotified(profileId, true) - }} -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EdziennikNotification.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EdziennikNotification.kt index a78f8ab1..605b644c 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EdziennikNotification.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EdziennikNotification.kt @@ -8,22 +8,20 @@ import android.app.Notification import android.app.NotificationManager import android.app.PendingIntent import android.content.Context -import android.content.Intent import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat.PRIORITY_MIN +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.Bundle import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.receivers.SzkolnyReceiver import kotlin.math.roundToInt -class EdziennikNotification(val context: Context) { - companion object { - const val NOTIFICATION_ID = 20191001 - } - - private val notificationManager by lazy { context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager } +class EdziennikNotification(val app: App) { + private val notificationManager by lazy { app.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager } private val notificationBuilder: NotificationCompat.Builder by lazy { - NotificationCompat.Builder(context, ApiService.NOTIFICATION_API_CHANNEL_ID) + NotificationCompat.Builder(app, ApiService.NOTIFICATION_API_CHANNEL_ID) .setSmallIcon(R.drawable.ic_notification) .setPriority(PRIORITY_MIN) .setOngoing(true) @@ -35,39 +33,42 @@ class EdziennikNotification(val context: Context) { private var errorCount = 0 private var criticalErrorCount = 0 + var serviceClosed = false private fun cancelPendingIntent(taskId: Int): PendingIntent { - val intent = Intent("pl.szczodrzynski.edziennik.SZKOLNY_MAIN") - intent.putExtra("task", "TaskCancelRequest") - intent.putExtra("taskId", taskId) - return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT) as PendingIntent + val intent = SzkolnyReceiver.getIntent(app, Bundle( + "task" to "TaskCancelRequest", + "taskId" to taskId + )) + return PendingIntent.getBroadcast(app, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT) as PendingIntent } private val closePendingIntent: PendingIntent get() { - val intent = Intent("pl.szczodrzynski.edziennik.SZKOLNY_MAIN") - intent.putExtra("task", "ServiceCloseRequest") - return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT) as PendingIntent + val intent = SzkolnyReceiver.getIntent(app, Bundle( + "task" to "ServiceCloseRequest" + )) + return PendingIntent.getBroadcast(app, 0, intent, 0) as PendingIntent } private fun errorCountText(): String? { var result = "" if (criticalErrorCount > 0) { - result += context.resources.getQuantityString(R.plurals.critical_errors_format, criticalErrorCount, criticalErrorCount) + result += app.resources.getQuantityString(R.plurals.critical_errors_format, criticalErrorCount, criticalErrorCount) } if (criticalErrorCount > 0 && errorCount > 0) { result += ", " } if (errorCount > 0) { - result += context.resources.getQuantityString(R.plurals.normal_errors_format, errorCount, errorCount) + result += app.resources.getQuantityString(R.plurals.normal_errors_format, errorCount, errorCount) } return if (result.isEmpty()) null else result } fun setIdle(): EdziennikNotification { - notificationBuilder.setContentTitle(context.getString(R.string.edziennik_notification_api_title)) + notificationBuilder.setContentTitle(app.getString(R.string.edziennik_notification_api_title)) notificationBuilder.setProgress(0, 0, false) notificationBuilder.apply { - val str = context.getString(R.string.edziennik_notification_api_text) + val str = app.getString(R.string.edziennik_notification_api_text) setStyle(NotificationCompat.BigTextStyle().bigText(str)) setContentText(str) } @@ -81,7 +82,7 @@ class EdziennikNotification(val context: Context) { } fun setCriticalError(): EdziennikNotification { criticalErrorCount++ - notificationBuilder.setContentTitle(context.getString(R.string.edziennik_notification_api_error_title)) + notificationBuilder.setContentTitle(app.getString(R.string.edziennik_notification_api_error_title)) notificationBuilder.setProgress(0, 0, false) notificationBuilder.apply { val str = errorCountText() @@ -118,7 +119,7 @@ class EdziennikNotification(val context: Context) { notificationBuilder.addAction( NotificationCompat.Action( R.drawable.ic_notification, - context.getString(R.string.edziennik_notification_api_close), + app.getString(R.string.edziennik_notification_api_close), closePendingIntent )) return this @@ -128,13 +129,15 @@ class EdziennikNotification(val context: Context) { notificationBuilder.addAction( NotificationCompat.Action( R.drawable.ic_notification, - context.getString(R.string.edziennik_notification_api_cancel), + app.getString(R.string.edziennik_notification_api_cancel), cancelPendingIntent(taskId) )) } fun post() { - notificationManager.notify(NOTIFICATION_ID, notification) + if (serviceClosed) + return + notificationManager.notify(app.notificationChannelsManager.sync.id, notification) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EndpointChooser.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EndpointChooser.kt index 84cdaee8..7f882123 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EndpointChooser.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/EndpointChooser.kt @@ -3,11 +3,11 @@ package pl.szczodrzynski.edziennik.data.api import pl.szczodrzynski.edziennik.data.api.models.Data import pl.szczodrzynski.edziennik.data.api.models.Feature import pl.szczodrzynski.edziennik.data.api.models.LoginMethod -import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimer -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_NEVER +import pl.szczodrzynski.edziennik.data.db.entity.EndpointTimer +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_NEVER -fun Data.prepare(loginMethods: List, features: List, featureIds: List, viewId: Int?) { +fun Data.prepare(loginMethods: List, features: List, featureIds: List, viewId: Int?, onlyEndpoints: List?) { val data = this val possibleLoginMethods = data.loginMethods.toMutableList() @@ -46,13 +46,19 @@ fun Data.prepare(loginMethods: List, features: List, featu // add all endpoint IDs and required login methods, filtering using timers .onEach { feature -> feature.endpointIds.forEach { endpoint -> + if (onlyEndpoints?.contains(endpoint.first) == false) + return@forEach (data.endpointTimers - .singleOrNull { it.endpointId == endpoint.first } ?: EndpointTimer(data.profile?.id ?: -1, endpoint.first)) + .singleOrNull { it.endpointId == endpoint.first } ?: EndpointTimer(data.profile?.id + ?: -1, endpoint.first)) .let { timer -> - if (timer.nextSync == SYNC_ALWAYS || - (viewId != null && timer.viewId == viewId) || - (timer.nextSync != SYNC_NEVER && timer.nextSync < timestamp)) { - data.targetEndpointIds.add(endpoint.first) + if ( + onlyEndpoints?.contains(endpoint.first) == true || + timer.nextSync == SYNC_ALWAYS || + viewId != null && timer.viewId == viewId || + timer.nextSync != SYNC_NEVER && timer.nextSync < timestamp + ) { + data.targetEndpointIds[endpoint.first] = timer.lastSync requiredLoginMethods.add(endpoint.second) } } @@ -75,9 +81,37 @@ fun Data.prepare(loginMethods: List, features: List, featu data.targetLoginMethodIds = data.targetLoginMethodIds.toHashSet().toMutableList() data.targetLoginMethodIds.sort() - data.targetEndpointIds = data.targetEndpointIds.toHashSet().toMutableList() - data.targetEndpointIds.sort() + //data.targetEndpointIds = data.targetEndpointIds.toHashSet().toMutableList() + //data.targetEndpointIds.sort() progressCount = targetLoginMethodIds.size + targetEndpointIds.size progressStep = if (progressCount <= 0) 0f else 100f / progressCount.toFloat() } + +fun Data.prepareFor(loginMethods: List, loginMethodId: Int) { + val possibleLoginMethods = this.loginMethods.toMutableList() + + loginMethods.forEach { + if (it.isPossible(profile, loginStore)) + possibleLoginMethods += it.loginMethodId + } + + targetLoginMethodIds.clear() + + // check the login method for any dependencies + var requiredLoginMethod: Int? = loginMethodId + while (requiredLoginMethod != LOGIN_METHOD_NOT_NEEDED) { + loginMethods.singleOrNull { it.loginMethodId == requiredLoginMethod }?.let { + if (requiredLoginMethod != null) + targetLoginMethodIds.add(requiredLoginMethod!!) + requiredLoginMethod = it.requiredLoginMethod(profile, loginStore) + } + } + + // sort and distinct every login method + targetLoginMethodIds = targetLoginMethodIds.toHashSet().toMutableList() + targetLoginMethodIds.sort() + + progressCount = 0 + progressStep = 0f +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt index 8ad2024a..eefc1d31 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt @@ -31,6 +31,11 @@ const val CODE_SYNERGIA_NOT_ACTIVATED = 32 const val CODE_LIBRUS_DISCONNECTED = 31 const val CODE_PROFILE_ARCHIVED = 30*/ +const val ERROR_APP_CRASH = 1 +const val ERROR_EXCEPTION = 2 +const val ERROR_API_EXCEPTION = 3 +const val ERROR_MESSAGE_NOT_SENT = 10 + const val ERROR_REQUEST_FAILURE = 50 const val ERROR_REQUEST_HTTP_400 = 51 const val ERROR_REQUEST_HTTP_401 = 52 @@ -38,13 +43,17 @@ const val ERROR_REQUEST_HTTP_403 = 53 const val ERROR_REQUEST_HTTP_404 = 54 const val ERROR_REQUEST_HTTP_405 = 55 const val ERROR_REQUEST_HTTP_410 = 56 -const val ERROR_REQUEST_HTTP_500 = 57 +const val ERROR_REQUEST_HTTP_424 = 57 +const val ERROR_REQUEST_HTTP_500 = 58 +const val ERROR_REQUEST_HTTP_503 = 59 const val ERROR_REQUEST_FAILURE_HOSTNAME_NOT_FOUND = 60 const val ERROR_REQUEST_FAILURE_TIMEOUT = 61 const val ERROR_REQUEST_FAILURE_NO_INTERNET = 62 +const val ERROR_REQUEST_FAILURE_SSL_ERROR = 63 const val ERROR_RESPONSE_EMPTY = 100 const val ERROR_LOGIN_DATA_MISSING = 101 const val ERROR_PROFILE_MISSING = 105 +const val ERROR_PROFILE_ARCHIVED = 106 const val ERROR_INVALID_LOGIN_MODE = 110 const val ERROR_LOGIN_METHOD_NOT_SATISFIED = 111 const val ERROR_NOT_IMPLEMENTED = 112 @@ -52,6 +61,33 @@ const val ERROR_FILE_DOWNLOAD = 113 const val ERROR_NO_STUDENTS_IN_ACCOUNT = 115 +const val ERROR_CAPTCHA_NEEDED = 3000 +const val ERROR_CAPTCHA_LIBRUS_PORTAL = 3001 + +const val ERROR_API_PDO_ERROR = 5000 +const val ERROR_API_INVALID_CLIENT = 5001 +const val ERROR_API_INVALID_ARGUMENT = 5002 +const val ERROR_API_INVALID_SIGNATURE = 5003 +const val ERROR_API_MISSING_SCOPES = 5004 +const val ERROR_API_RESOURCE_NOT_FOUND = 5005 +const val ERROR_API_INTERNAL_SERVER_ERROR = 5006 +const val ERROR_API_PHP_E_ERROR = 5007 +const val ERROR_API_PHP_E_WARNING = 5008 +const val ERROR_API_PHP_E_PARSE = 5009 +const val ERROR_API_PHP_E_NOTICE = 5010 +const val ERROR_API_PHP_E_OTHER = 5011 +const val ERROR_API_MAINTENANCE = 5012 +const val ERROR_API_MISSING_ARGUMENT = 5013 +const val ERROR_API_PAYLOAD_EMPTY = 5014 +const val ERROR_API_INVALID_ACTION = 5015 +const val ERROR_API_UPDATE_NOT_FOUND = 5016 +const val ERROR_API_INVALID_DEVICEID_USERCODE = 5017 +const val ERROR_API_INVALID_PAIRTOKEN = 5018 +const val ERROR_API_INVALID_BROWSERID = 5019 +const val ERROR_API_INVALID_DEVICEID = 5020 +const val ERROR_API_INVALID_DEVICEID_BROWSERID = 5021 +const val ERROR_API_HELP_CATEGORY_NOT_FOUND = 5022 + const val CODE_INTERNAL_LIBRUS_ACCOUNT_410 = 120 const val CODE_INTERNAL_LIBRUS_SYNERGIA_EXPIRED = 121 const val ERROR_LOGIN_LIBRUS_API_CAPTCHA_NEEDED = 124 @@ -109,6 +145,13 @@ const val ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN = 179 const val ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN = 180 const val ERROR_LIBRUS_API_MAINTENANCE = 181 const val ERROR_LIBRUS_PORTAL_MAINTENANCE = 182 +const val ERROR_LIBRUS_API_NOTICEBOARD_PROBLEM = 183 +const val ERROR_LOGIN_LIBRUS_PORTAL_CSRF_EXPIRED = 184 +const val ERROR_LIBRUS_API_DEVICE_REGISTERED = 185 +const val ERROR_LIBRUS_MESSAGES_NOT_FOUND = 186 +const val ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST = 187 +const val ERROR_LIBRUS_MESSAGES_ATTACHMENT_NOT_FOUND = 188 +const val ERROR_LOGIN_LIBRUS_MESSAGES_TIMEOUT = 189 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN = 201 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD = 202 @@ -123,40 +166,50 @@ const val ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE = 216 const val ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID = 213 const val ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE = 214 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID = 215 +const val ERROR_LOGIN_MOBIDZIENNIK_API2_INVALID_LOGIN = 216 +const val ERROR_LOGIN_MOBIDZIENNIK_API2_OTHER = 217 +const val ERROR_MOBIDZIENNIK_WEB_SERVER_PROBLEM = 218 const val ERROR_LOGIN_VULCAN_INVALID_SYMBOL = 301 const val ERROR_LOGIN_VULCAN_INVALID_TOKEN = 302 -const val ERROR_LOGIN_VULCAN_INVALID_PIN = 309 const val ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING = 310 const val ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING = 311 const val ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING = 312 const val ERROR_LOGIN_VULCAN_EXPIRED_TOKEN = 321 -const val ERROR_LOGIN_VULCAN_OTHER = 322 -const val ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN = 330 const val ERROR_LOGIN_VULCAN_NO_PUPILS = 331 -const val ERROR_VULCAN_API_MAINTENANCE = 340 -const val ERROR_VULCAN_API_BAD_REQUEST = 341 -const val ERROR_VULCAN_API_OTHER = 342 +const val ERROR_VULCAN_ATTACHMENT_DOWNLOAD = 343 +const val ERROR_VULCAN_WEB_DATA_MISSING = 344 +const val ERROR_VULCAN_WEB_429 = 345 +const val ERROR_VULCAN_WEB_OTHER = 346 +const val ERROR_VULCAN_WEB_NO_CERTIFICATE = 347 +const val ERROR_VULCAN_WEB_NO_REGISTER = 348 +const val ERROR_VULCAN_WEB_CERTIFICATE_EXPIRED = 349 +const val ERROR_VULCAN_WEB_LOGGED_OUT = 350 +const val ERROR_VULCAN_WEB_CERTIFICATE_POST_FAILED = 351 +const val ERROR_VULCAN_WEB_GRADUATE_ACCOUNT = 352 +const val ERROR_VULCAN_WEB_NO_SCHOOLS = 353 +const val ERROR_VULCAN_HEBE_OTHER = 354 +const val ERROR_VULCAN_HEBE_SIGNATURE_ERROR = 360 +const val ERROR_VULCAN_HEBE_INVALID_PAYLOAD = 361 +const val ERROR_VULCAN_HEBE_FIREBASE_ERROR = 362 +const val ERROR_VULCAN_HEBE_CERTIFICATE_GONE = 363 +const val ERROR_VULCAN_HEBE_SERVER_ERROR = 364 +const val ERROR_VULCAN_HEBE_ENTITY_NOT_FOUND = 365 +const val ERROR_VULCAN_HEBE_MISSING_SENDER_ENTRY = 366 +const val ERROR_VULCAN_API_DEPRECATED = 390 -const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN = 401 -const val ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME = 402 -const val ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED = 403 -const val ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE = 404 -const val ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR = 405 -const val ERROR_LOGIN_IDZIENNIK_WEB_OTHER = 410 -const val ERROR_LOGIN_IDZIENNIK_WEB_API_NO_ACCESS = 411 /* {"d":{"__type":"mds.Web.mod_komunikator.WS_mod_wiadomosci+detailWiadomosci","Wiadomosc":{"_recordId":0,"DataNadania":null,"DataOdczytania":null,"Nadawca":null,"ListaOdbiorcow":[],"Tytul":null,"Text":null,"ListaZal":[]},"Bledy":{"__type":"mds.Module.Globalne+sBledy","CzyJestBlad":true,"ListaBledow":["Nie masz dostępu do tych zasobów!"],"ListaKodowBledow":[]},"czyJestWiecej":false}} */ -const val ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION = 420 -const val ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH = 421 -const val ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER = 422 -const val ERROR_IDZIENNIK_WEB_ACCESS_DENIED = 430 -const val ERROR_IDZIENNIK_WEB_OTHER = 431 -const val ERROR_IDZIENNIK_WEB_MAINTENANCE = 432 -const val ERROR_IDZIENNIK_WEB_SERVER_ERROR = 433 -const val ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED = 434 -const val ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR = 440 -const val ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA = 441 -const val ERROR_IDZIENNIK_API_ACCESS_DENIED = 450 -const val ERROR_IDZIENNIK_API_OTHER = 451 +const val ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN = 501 +const val ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER = 510 +const val ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID = 511 +const val ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS = 521 +const val ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED = 522 +const val ERROR_EDUDZIENNIK_WEB_TEAM_MISSING = 530 + +const val ERROR_LOGIN_PODLASIE_API_INVALID_TOKEN = 601 +const val ERROR_LOGIN_PODLASIE_API_DEVICE_LIMIT = 602 +const val ERROR_PODLASIE_API_NO_TOKEN = 630 +const val ERROR_PODLASIE_API_OTHER = 631 +const val ERROR_PODLASIE_API_DATA_MISSING = 632 const val ERROR_TEMPLATE_WEB_OTHER = 801 @@ -167,13 +220,16 @@ const val EXCEPTION_LIBRUS_PORTAL_SYNERGIA_TOKEN = 903 const val EXCEPTION_LIBRUS_API_REQUEST = 904 const val EXCEPTION_LIBRUS_SYNERGIA_REQUEST = 905 const val EXCEPTION_MOBIDZIENNIK_WEB_REQUEST = 906 -const val EXCEPTION_VULCAN_API_REQUEST = 907 const val EXCEPTION_MOBIDZIENNIK_WEB_FILE_REQUEST = 908 const val EXCEPTION_LIBRUS_MESSAGES_FILE_REQUEST = 909 const val EXCEPTION_NOTIFY = 910 const val EXCEPTION_LIBRUS_MESSAGES_REQUEST = 911 -const val EXCEPTION_IDZIENNIK_WEB_REQUEST = 912 -const val EXCEPTION_IDZIENNIK_WEB_API_REQUEST = 913 -const val EXCEPTION_IDZIENNIK_API_REQUEST = 914 +const val EXCEPTION_EDUDZIENNIK_WEB_REQUEST = 920 +const val EXCEPTION_EDUDZIENNIK_FILE_REQUEST = 921 +const val ERROR_ONEDRIVE_DOWNLOAD = 930 +const val EXCEPTION_VULCAN_WEB_LOGIN = 931 +const val EXCEPTION_VULCAN_WEB_REQUEST = 932 +const val EXCEPTION_PODLASIE_API_REQUEST = 940 +const val EXCEPTION_VULCAN_HEBE_REQUEST = 950 const val LOGIN_NO_ARGUMENTS = 1201 diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Features.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Features.kt index 40f24048..e38b37b5 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Features.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Features.kt @@ -13,8 +13,8 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT +import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED +import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT internal const val FEATURE_TIMETABLE = 1 internal const val FEATURE_AGENDA = 2 @@ -41,6 +41,7 @@ internal const val FEATURE_PUSH_CONFIG = 120 object Features { private fun getAllNecessary(): List = listOf( FEATURE_ALWAYS_NEEDED, + FEATURE_PUSH_CONFIG, FEATURE_STUDENT_INFO, FEATURE_STUDENT_NUMBER, FEATURE_SCHOOL_INFO, diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt index 41350c84..b3db9f71 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/LoginMethods.kt @@ -4,26 +4,27 @@ package pl.szczodrzynski.edziennik.data.api -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginApi -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginWeb +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginApi import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginMessages import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginPortal import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginSynergia +import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLoginApi2 import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLoginWeb +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login.PodlasieLoginApi import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginApi import pl.szczodrzynski.edziennik.data.api.edziennik.template.login.TemplateLoginWeb -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginHebe +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginWebMain import pl.szczodrzynski.edziennik.data.api.models.LoginMethod // librus // mobidziennik -// idziennik +// idziennik [*] // vulcan // mobireg -const val SYNERGIA_API_ENABLED = true - +const val SYNERGIA_API_ENABLED = false const val LOGIN_TYPE_IDZIENNIK = 3 @@ -31,14 +32,10 @@ const val LOGIN_TYPE_IDZIENNIK = 3 const val LOGIN_TYPE_TEMPLATE = 21 // LOGIN MODES -const val LOGIN_MODE_IDZIENNIK_WEB = 0 - const val LOGIN_MODE_TEMPLATE_WEB = 0 // LOGIN METHODS const val LOGIN_METHOD_NOT_NEEDED = -1 -const val LOGIN_METHOD_IDZIENNIK_WEB = 100 -const val LOGIN_METHOD_IDZIENNIK_API = 200 const val LOGIN_METHOD_TEMPLATE_WEB = 100 const val LOGIN_METHOD_TEMPLATE_API = 200 @@ -68,13 +65,13 @@ val librusLoginMethods = listOf( LoginMethod(LOGIN_TYPE_LIBRUS, LOGIN_METHOD_LIBRUS_SYNERGIA, LibrusLoginSynergia::class.java) .withIsPossible { _, loginStore -> !loginStore.hasLoginData("fakeLogin") } .withRequiredLoginMethod { profile, _ -> - if (profile?.hasStudentData("accountPassword") == false) LOGIN_METHOD_LIBRUS_API else LOGIN_METHOD_NOT_NEEDED + if (profile?.hasStudentData("accountPassword") == false || true) LOGIN_METHOD_LIBRUS_API else LOGIN_METHOD_NOT_NEEDED }, LoginMethod(LOGIN_TYPE_LIBRUS, LOGIN_METHOD_LIBRUS_MESSAGES, LibrusLoginMessages::class.java) .withIsPossible { _, loginStore -> !loginStore.hasLoginData("fakeLogin") } .withRequiredLoginMethod { profile, _ -> - if (profile?.hasStudentData("accountPassword") == false) LOGIN_METHOD_LIBRUS_SYNERGIA else LOGIN_METHOD_NOT_NEEDED + if (profile?.hasStudentData("accountPassword") == false || true) LOGIN_METHOD_LIBRUS_SYNERGIA else LOGIN_METHOD_NOT_NEEDED } ) @@ -85,27 +82,28 @@ const val LOGIN_METHOD_MOBIDZIENNIK_API2 = 300 val mobidziennikLoginMethods = listOf( LoginMethod(LOGIN_TYPE_MOBIDZIENNIK, LOGIN_METHOD_MOBIDZIENNIK_WEB, MobidziennikLoginWeb::class.java) .withIsPossible { _, _ -> true } - .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }/*, + .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }, LoginMethod(LOGIN_TYPE_MOBIDZIENNIK, LOGIN_METHOD_MOBIDZIENNIK_API2, MobidziennikLoginApi2::class.java) - .withIsPossible { _, loginStore -> loginStore.hasLoginData("email") } - .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }*/ + .withIsPossible { profile, _ -> profile?.getStudentData("email", null) != null } + .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED } ) const val LOGIN_TYPE_VULCAN = 4 const val LOGIN_MODE_VULCAN_API = 0 const val LOGIN_MODE_VULCAN_WEB = 1 +const val LOGIN_MODE_VULCAN_HEBE = 2 const val LOGIN_METHOD_VULCAN_WEB_MAIN = 100 const val LOGIN_METHOD_VULCAN_WEB_NEW = 200 const val LOGIN_METHOD_VULCAN_WEB_OLD = 300 const val LOGIN_METHOD_VULCAN_WEB_MESSAGES = 400 -const val LOGIN_METHOD_VULCAN_API = 500 +const val LOGIN_METHOD_VULCAN_HEBE = 600 val vulcanLoginMethods = listOf( - /*LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_MAIN, VulcanLoginWebMain::class.java) - .withIsPossible { _, _ -> false } + LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_MAIN, VulcanLoginWebMain::class.java) + .withIsPossible { _, loginStore -> loginStore.hasLoginData("webHost") } .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }, - LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_NEW, VulcanLoginWebNew::class.java) + /*LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_WEB_NEW, VulcanLoginWebNew::class.java) .withIsPossible { _, _ -> false } .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_VULCAN_WEB_MAIN }, @@ -113,21 +111,29 @@ val vulcanLoginMethods = listOf( .withIsPossible { _, _ -> false } .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_VULCAN_WEB_MAIN },*/ - LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_API, VulcanLoginApi::class.java) - .withIsPossible { _, _ -> true } - .withRequiredLoginMethod { _, loginStore -> - if (loginStore.mode == LOGIN_MODE_VULCAN_WEB) LOGIN_METHOD_VULCAN_WEB_NEW else LOGIN_METHOD_NOT_NEEDED + LoginMethod(LOGIN_TYPE_VULCAN, LOGIN_METHOD_VULCAN_HEBE, VulcanLoginHebe::class.java) + .withIsPossible { _, loginStore -> + loginStore.mode != LOGIN_MODE_VULCAN_API } + .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED } ) -val idziennikLoginMethods = listOf( - LoginMethod(LOGIN_TYPE_IDZIENNIK, LOGIN_METHOD_IDZIENNIK_WEB, IdziennikLoginWeb::class.java) +const val LOGIN_TYPE_EDUDZIENNIK = 5 +const val LOGIN_MODE_EDUDZIENNIK_WEB = 0 +const val LOGIN_METHOD_EDUDZIENNIK_WEB = 100 +val edudziennikLoginMethods = listOf( + LoginMethod(LOGIN_TYPE_EDUDZIENNIK, LOGIN_METHOD_EDUDZIENNIK_WEB, EdudziennikLoginWeb::class.java) .withIsPossible { _, _ -> true } - .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED }, + .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED } +) - LoginMethod(LOGIN_TYPE_IDZIENNIK, LOGIN_METHOD_IDZIENNIK_API, IdziennikLoginApi::class.java) +const val LOGIN_TYPE_PODLASIE = 6 +const val LOGIN_MODE_PODLASIE_API = 0 +const val LOGIN_METHOD_PODLASIE_API = 100 +val podlasieLoginMethods = listOf( + LoginMethod(LOGIN_TYPE_PODLASIE, LOGIN_METHOD_PODLASIE_API, PodlasieLoginApi::class.java) .withIsPossible { _, _ -> true } - .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_IDZIENNIK_WEB } + .withRequiredLoginMethod { _, _ -> LOGIN_METHOD_NOT_NEEDED } ) val templateLoginMethods = listOf( diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt index 87e885a6..2bbf1894 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/Regexes.kt @@ -4,82 +4,271 @@ package pl.szczodrzynski.edziennik.data.api +import kotlin.text.RegexOption.DOT_MATCHES_ALL +import kotlin.text.RegexOption.IGNORE_CASE + object Regexes { + val STYLE_CSS_COLOR by lazy { + """color: (\w+);?""".toRegex() + } + + val NOT_DIGITS by lazy { + """[^0-9]""".toRegex() + } + + + val MOBIDZIENNIK_GRADES_SUBJECT_NAME by lazy { - """\n*\s*(.+?)\s*\n*(?:<.*?)??""".toRegex(RegexOption.DOT_MATCHES_ALL) + """\n*\s*(.+?)\s*\n*(?:<.*?)??""".toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_GRADES_COLOR by lazy { - """background-color:([#A-Fa-f0-9]+);""".toRegex(RegexOption.DOT_MATCHES_ALL) + """background-color:([#A-Fa-f0-9]+);""".toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_GRADES_CATEGORY by lazy { - """> (.+?):""".toRegex(RegexOption.DOT_MATCHES_ALL) + """> (.+?):""".toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_GRADES_CLASS_AVERAGE by lazy { - """Średnia ocen:.*([0-9]*\.?[0-9]*)""".toRegex(RegexOption.DOT_MATCHES_ALL) + """Średnia ocen:.*([0-9]*\.?[0-9]*)""".toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_GRADES_ADDED_DATE by lazy { - """Wpisano:.*.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(RegexOption.DOT_MATCHES_ALL) + """Wpisano:.*.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_GRADES_COUNT_TO_AVG by lazy { - """Liczona do średniej:.*?nie
    """.toRegex(RegexOption.DOT_MATCHES_ALL) + """Liczona do średniej:.*?nie
    """.toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_GRADES_DETAILS by lazy { - """(.+?).*?.+?.*?(?:\((.+?)\).*?)?.*?Wartość oceny:.*?([0-9.]+).*?Wpisał\(a\):.*?(.+?).*?(?:Komentarz:.*?(.+?))?""".toRegex(RegexOption.DOT_MATCHES_ALL) + """(.+?).*?.+?.*?(?:\((.+?)\).*?)?.*?Wartość oceny:.*?([0-9.]+).*?Wpisał\(a\):.*?(.+?).*?(?:Komentarz:.*?(.+?))?""".toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_EVENT_TYPE by lazy { - """\(([0-9A-ząęóżźńśłć]*?)\)$""".toRegex(RegexOption.DOT_MATCHES_ALL) + """\(([0-9A-ząęóżźńśłć]*?)\)$""".toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_LUCKY_NUMBER by lazy { - """class="szczesliwy_numerek".*>0*([0-9]+)(?:/0*[0-9]+)*""".toRegex(RegexOption.DOT_MATCHES_ALL) + """class="szczesliwy_numerek".*?>0?([0-9]+)/?0?([0-9]+)?""".toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_CLASS_CALENDAR by lazy { """events: (.+),$""".toRegex(RegexOption.MULTILINE) } val MOBIDZIENNIK_MESSAGE_READ_DATE by lazy { - """czas przeczytania:.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(RegexOption.DOT_MATCHES_ALL) + """czas przeczytania:.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_MESSAGE_SENT_READ_DATE by lazy { - """.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(RegexOption.DOT_MATCHES_ALL) + """.+?,\s([0-9]+)\s(.+?)\s([0-9]{4}),\sgodzina\s([0-9:]+)""".toRegex(DOT_MATCHES_ALL) } val MOBIDZIENNIK_MESSAGE_ATTACHMENT by lazy { - """href="https://.+?\.mobidziennik.pl/.+?&(?:amp;)?zalacznik=([0-9]+)"(?:.+?(.+?)""".toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_ATTENDANCE_TABLE by lazy { + """(.+?)
    """.toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_ATTENDANCE_LESSON_COUNT by lazy { + """rel="([0-9-]{10})" colspan="([0-9]+)"""".toRegex() + } + val MOBIDZIENNIK_ATTENDANCE_ENTRIES by lazy { + """font-size:.+?class=".*?">(.*?)""".toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_ATTENDANCE_COLUMNS by lazy { + """(.+?)""".toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_ATTENDANCE_COLUMN by lazy { + """()(.*?)""".toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_ATTENDANCE_COLUMN_SPAN by lazy { + """colspan="(\d+)"""".toRegex() + } + val MOBIDZIENNIK_ATTENDANCE_RANGE by lazy { + """([0-9:]+) - .+? (.+?)""".toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_ATTENDANCE_LESSON by lazy { + """(.+?)\s*\s*\((.+?),\s*(.+?)\)""".toRegex(DOT_MATCHES_ALL) + } + + val MOBIDZIENNIK_HOMEWORK_ROW by lazy { + """class="rowRolling">(.+?\s*)""".toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_HOMEWORK_ITEM by lazy { + """

    (.+?):\s*(.+?)\s*

    """.toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_HOMEWORK_BODY by lazy { + """Treść:(.+?)

    """.toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_HOMEWORK_ID by lazy { + """zadanieFormularz\(([0-9]+),""".toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_HOMEWORK_ATTACHMENT by lazy { + """zalacznik(_zadania)?=([0-9]+)'.+?word-break">(.+?)""".toRegex(DOT_MATCHES_ALL) + } + + + val MOBIDZIENNIK_TIMETABLE_TOP by lazy { + """

    .+?
    """.toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_TIMETABLE_CELL by lazy { + """
    .+?style="(.+?)".+?title="(.+?)".+?>\s+(.+?)\s+
    """.toRegex(DOT_MATCHES_ALL) + } + val MOBIDZIENNIK_TIMETABLE_LEFT by lazy { + """
    .+?
    """.toRegex(DOT_MATCHES_ALL) } val IDZIENNIK_LOGIN_HIDDEN_FIELDS by lazy { - """""".toRegex(RegexOption.DOT_MATCHES_ALL) + """""".toRegex(DOT_MATCHES_ALL) } val IDZIENNIK_LOGIN_ERROR by lazy { - """id="spanErrorMessage">(.*?)(.*?)(.+?)""".toRegex(RegexOption.DOT_MATCHES_ALL) + """Imię i nazwisko:.+?">(.+?)""".toRegex(DOT_MATCHES_ALL) } val IDZIENNIK_LOGIN_FIRST_IS_PARENT by lazy { """id="ctl00_CzyRodzic" value="([01])" />""".toRegex() } val IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR by lazy { - """name="ctl00\${"$"}dxComboRokSzkolny".+?selected="selected".*?value="([0-9]+)">([0-9/]+)<""".toRegex(RegexOption.DOT_MATCHES_ALL) + """name="ctl00\${"$"}dxComboRokSzkolny".+?selected="selected".*?value="([0-9]+)">([0-9]+)/([0-9]+)<""".toRegex(DOT_MATCHES_ALL) } val IDZIENNIK_LOGIN_FIRST_STUDENT_SELECT by lazy { - """""".toRegex(RegexOption.DOT_MATCHES_ALL) + """""".toRegex(DOT_MATCHES_ALL) } val IDZIENNIK_LOGIN_FIRST_STUDENT by lazy { - """(.+?)\s(.+?)\s*\((.+?),\s*(.+?)\)""".toRegex(RegexOption.DOT_MATCHES_ALL) + """(.+?)\s(.+?)\s*\((.+?),\s*(.+?)\)""".toRegex(DOT_MATCHES_ALL) + } + val IDZIENNIK_MESSAGES_RECIPIENT_PARENT by lazy { + """(.+?)\s\((.+)\)""".toRegex() + } + /*Szczęśliwy los na dzisiaj to 19. Los na jutro to 22*/ + val IDZIENNIK_WEB_LUCKY_NUMBER by lazy { + """dzisiaj to ([0-9]+)""".toRegex() + } + val IDZIENNIK_WEB_SELECTED_REGISTER by lazy { + """selected="selected" value="([0-9]+)" data-id-ucznia""".toRegex() } - val VULCAN_SHITFT_ANNOTATION by lazy { + val VULCAN_SHIFT_ANNOTATION by lazy { """\(przeniesiona (z|na) lekcj[ię] ([0-9]+), (.+)\)""".toRegex() } + val VULCAN_WEB_PERMISSIONS by lazy { + """permissions: '([A-z0-9/=+\-_|]+?)'""".toRegex() + } + val VULCAN_WEB_SYMBOL_VALIDATE by lazy { + """[A-z0-9]+""".toRegex(IGNORE_CASE) + } val LIBRUS_ATTACHMENT_KEY by lazy { - """singleUseKey=([0-9A-f_]+)""".toRegex() + """singleUseKey=([0-9A-z_]+)""".toRegex() + } + val LIBRUS_MESSAGE_ID by lazy { + """/wiadomosci/[0-9]+/[0-9]+/([0-9]+?)/""".toRegex() + } + + + + val EDUDZIENNIK_STUDENTS_START by lazy { + """
  • (.*?)""".toRegex() + } + val EDUDZIENNIK_ACCOUNT_NAME_START by lazy { + """(.*?)""".toRegex() + } + val EDUDZIENNIK_SUBJECTS_START by lazy { + """(.+?)""".toRegex() + } + + val EDUDZIENNIK_ATTENDANCE_ENTRIES by lazy { + """(.+?)""".toRegex() + } + val EDUDZIENNIK_ATTENDANCE_TYPES by lazy { + """
    .*?

    (.*?)

    """.toRegex(DOT_MATCHES_ALL) + } + val EDUDZIENNIK_ATTENDANCE_TYPE by lazy { + """\((.+?)\) (.+)""".toRegex() + } + + val EDUDZIENNIK_ANNOUNCEMENT_DESCRIPTION by lazy { + """
    .*?

    (.*?)

    """.toRegex(DOT_MATCHES_ALL) + } + val EDUDZIENNIK_HOMEWORK_DESCRIPTION by lazy { + """
    (.*?)
    """.toRegex(DOT_MATCHES_ALL) + } + + val EDUDZIENNIK_SUBJECT_ID by lazy { + """/Courses/([\w-_]+?)/""".toRegex() + } + val EDUDZIENNIK_GRADE_ID by lazy { + """/Grades/([\w-_]+?)/""".toRegex() + } + val EDUDZIENNIK_EXAM_ID by lazy { + """/Evaluations/([\w-_]+?)/""".toRegex() + } + val EDUDZIENNIK_EVENT_TYPE_ID by lazy { + """/GradeLabels/([\w-_]+?)/""".toRegex() + } + val EDUDZIENNIK_ANNOUNCEMENT_ID by lazy { + """/Announcement/([\w-_]+?)/""".toRegex() + } + val EDUDZIENNIK_HOMEWORK_ID by lazy { + """/Homework/([\w-_]+?)/""".toRegex() + } + val EDUDZIENNIK_TEACHER_ID by lazy { + """/Teachers/([\w-_]+?)/""".toRegex() + } + val EDUDZIENNIK_EVENT_ID by lazy { + """/KlassEvent/([\w-_]+?)/""".toRegex() + } + val EDUDZIENNIK_NOTE_ID by lazy { + """/RegistryNotes/([\w-_]+?)/""".toRegex() + } + + val EDUDZIENNIK_SCHOOL_DETAIL_ID by lazy { + """.*?

    (.*?)

    .*?
  • ", "
  • - ")) + } + + textView.movementMethod = BetterLinkMovementMethod.getInstance() + + val scrollView = ScrollView(activity) + scrollView.addView(textView) + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.whats_new) + .setView(scrollView) + .setPositiveButton(R.string.close) { dialog, _ -> + dialog.dismiss() + } + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt index 89af0ed3..74ba0030 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/day/DayDialog.kt @@ -5,24 +5,27 @@ package pl.szczodrzynski.edziennik.ui.dialogs.day import android.view.View -import android.widget.Toast import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity -import androidx.lifecycle.Observer +import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.R +import kotlinx.coroutines.* +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.db.entity.Lesson import pl.szczodrzynski.edziennik.databinding.DialogDayBinding -import pl.szczodrzynski.edziennik.onClick -import pl.szczodrzynski.edziennik.setText +import pl.szczodrzynski.edziennik.ui.dialogs.event.EventDetailsDialog import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListAdapter import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog +import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog +import pl.szczodrzynski.edziennik.ui.dialogs.teacherabsence.TeacherAbsenceDialog +import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges.LessonChangesEvent +import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges.LessonChangesEventRenderer +import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEvent +import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEventRenderer import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time import pl.szczodrzynski.edziennik.utils.models.Week import kotlin.coroutines.CoroutineContext @@ -30,6 +33,7 @@ class DayDialog( val activity: AppCompatActivity, val profileId: Int, val date: Date, + val eventTypeId: Long? = null, val onShowListener: ((tag: String) -> Unit)? = null, val onDismissListener: ((tag: String) -> Unit)? = null ) : CoroutineScope { @@ -77,22 +81,105 @@ class DayDialog( update() }} - private fun update() { + private fun update() { launch { b.dayDate.setText( R.string.dialog_day_date_format, Week.getFullDayName(date.weekDay), date.formattedString ) + val lessons = withContext(Dispatchers.Default) { + app.db.timetableDao().getAllForDateNow(profileId, date) + }.filter { it.type != Lesson.TYPE_NO_LESSONS } + + if (lessons.isNotEmpty()) { run { + val startTime = lessons.first().startTime ?: return@run + val endTime = lessons.last().endTime ?: return@run + val diff = Time.diff(startTime, endTime) + + b.lessonsInfo.setText( + R.string.dialog_day_lessons_info, + startTime.stringHM, + endTime.stringHM, + lessons.size.toString(), + diff.hour.toString(), + diff.minute.toString() + ) + + b.lessonsInfo.visibility = View.VISIBLE + }} + + val lessonChanges = withContext(Dispatchers.Default) { + app.db.timetableDao().getChangesForDateNow(profileId, date) + } + + lessonChanges.ifNotEmpty { + LessonChangesEventRenderer().render( + b.lessonChanges, LessonChangesEvent( + profileId = profileId, + date = date, + count = it.size, + showBadge = false + ) + ) + + b.lessonChangesFrame.onClick { + LessonChangeDialog( + activity, + profileId, + date, + onShowListener = onShowListener, + onDismissListener = onDismissListener + ) + } + } + b.lessonChangesFrame.isVisible = lessonChanges.isNotEmpty() + + val teacherAbsences = withContext(Dispatchers.Default) { + app.db.teacherAbsenceDao().getAllByDateNow(profileId, date) + } + + teacherAbsences.ifNotEmpty { + TeacherAbsenceEventRenderer().render( + b.teacherAbsence, TeacherAbsenceEvent( + profileId = profileId, + date = date, + count = it.size + ) + ) + + b.teacherAbsenceFrame.onClick { + TeacherAbsenceDialog( + activity, + profileId, + date, + onShowListener = onShowListener, + onDismissListener = onDismissListener + ) + } + } + b.teacherAbsenceFrame.isVisible = teacherAbsences.isNotEmpty() + adapter = EventListAdapter( activity, + showWeekDay = false, + showDate = false, + showType = true, + showTime = true, + showSubject = true, + markAsSeen = true, onItemClick = { - Toast.makeText(activity, "Event clicked ${it.topic}", Toast.LENGTH_SHORT).show() + EventDetailsDialog( + activity, + it, + onShowListener = onShowListener, + onDismissListener = onDismissListener + ) }, onEventEditClick = { EventManualDialog( activity, - profileId, + it.profileId, editingEvent = it, onShowListener = onShowListener, onDismissListener = onDismissListener @@ -100,11 +187,16 @@ class DayDialog( } ) - app.db.eventDao().getAllByDate(profileId, date).observe(activity, Observer { events -> - adapter.items = events + app.db.eventDao().getAllByDate(profileId, date).observe(activity) { events -> + adapter.items = if (eventTypeId != null) + events.filter { it.type == eventTypeId } + else + events + if (b.eventsView.adapter == null) { b.eventsView.adapter = adapter b.eventsView.apply { + isNestedScrollingEnabled = false setHasFixedSize(true) layoutManager = LinearLayoutManager(context) addItemDecoration(SimpleDividerItemDecoration(context)) @@ -119,6 +211,6 @@ class DayDialog( b.eventsView.visibility = View.GONE b.eventsNoData.visibility = View.VISIBLE } - }) - } + } + }} } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventAddTypeDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventAddTypeDialog.kt deleted file mode 100644 index 752b3dd1..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventAddTypeDialog.kt +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-11-12. - */ - -package pl.szczodrzynski.edziennik.ui.dialogs.event - -import android.app.Activity -import androidx.appcompat.app.AlertDialog -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.utils.models.Date -import pl.szczodrzynski.edziennik.utils.models.Time - -class EventAddTypeDialog( - val activity: Activity, - val profileId: Int, - val date: Date? = null, - val time: Time? = null -) { - companion object { - private const val TAG = "EventAddTypeDialog" - } - - private lateinit var dialog: AlertDialog - - init { run { - dialog = MaterialAlertDialogBuilder(activity) - .setItems(R.array.main_menu_add_options) { dialog, which -> - dialog.dismiss() - EventManualDialogOld(activity, profileId) - .show( - activity.application as App, - null, - date, - time, - when (which) { - 1 -> EventManualDialogOld.DIALOG_HOMEWORK - else -> EventManualDialogOld.DIALOG_EVENT - } - ) - - } - .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() } - .show() - }} -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventDetailsDialog.kt new file mode 100644 index 00000000..c80f0c63 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventDetailsDialog.kt @@ -0,0 +1,376 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-12-18. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.event + +import android.content.ActivityNotFoundException +import android.content.Intent +import android.provider.CalendarContract +import android.provider.CalendarContract.Events +import android.view.View +import android.widget.Toast +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.isVisible +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.* +import org.greenrobot.eventbus.EventBus +import org.greenrobot.eventbus.Subscribe +import org.greenrobot.eventbus.ThreadMode +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask +import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.databinding.DialogEventDetailsBinding +import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment +import pl.szczodrzynski.edziennik.utils.BetterLink +import pl.szczodrzynski.edziennik.utils.models.Date +import kotlin.coroutines.CoroutineContext + +class EventDetailsDialog( + val activity: AppCompatActivity, + var event: EventFull, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "EventDetailsDialog" + } + + private lateinit var app: App + private lateinit var b: DialogEventDetailsBinding + private lateinit var dialog: AlertDialog + private var removeEventDialog: AlertDialog? = null + private val eventShared = event.sharedBy != null + private val eventOwn = event.sharedBy == "self" + private val manager + get() = app.eventManager + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + private val api by lazy { + SzkolnyApi(app) + } + + private var progressDialog: AlertDialog? = null + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + EventBus.getDefault().register(this) + app = activity.applicationContext as App + b = DialogEventDetailsBinding.inflate(activity.layoutInflater) + dialog = MaterialAlertDialogBuilder(activity) + .setView(b.root) + .setPositiveButton(R.string.close) { dialog, _ -> + dialog.dismiss() + } + .apply { + if (event.addedManually) + setNeutralButton(R.string.remove, null) + } + .setOnDismissListener { + onDismissListener?.invoke(TAG) + EventBus.getDefault().unregister(this@EventDetailsDialog) + progressDialog?.dismiss() + } + .show() + + dialog.getButton(AlertDialog.BUTTON_NEUTRAL)?.onClick { + showRemoveEventDialog() + } + + update() + }} + + private fun update() { + b.event = event + b.eventShared = eventShared + b.eventOwn = eventOwn + + if (!event.seen) { + manager.markAsSeen(event) + } + + val bullet = " • " + val colorSecondary = android.R.attr.textColorSecondary.resolveAttr(activity) + + try { + b.monthName = app.resources.getStringArray(R.array.months_day_of_array)[event.date.month - 1] + } + catch (_: Exception) {} + + manager.setLegendText(b.legend, event) + + b.typeColor.background?.setTintColor(event.eventColor) + + b.details = mutableListOf( + event.subjectLongName, + event.teamName?.asColoredSpannable(colorSecondary) + ).concat(bullet) + + b.addedBy.setText( + when (event.sharedBy) { + null -> when { + event.addedManually -> R.string.event_details_added_by_self_format + event.teacherName == null -> R.string.event_details_added_by_unknown_format + else -> R.string.event_details_added_by_format + } + "self" -> R.string.event_details_shared_by_self_format + else -> R.string.event_details_shared_by_format + }, + Date.fromMillis(event.addedDate).formattedString, + event.sharedByName ?: event.teacherName ?: "" + ) + + + // MARK AS DONE + b.checkDoneButton.isChecked = event.isDone + b.checkDoneButton.onChange { _, isChecked -> + if (isChecked && !event.isDone) { + b.checkDoneButton.isChecked = false + MaterialAlertDialogBuilder(activity) + .setTitle(R.string.event_mark_as_done_title) + .setMessage(R.string.event_mark_as_done_text) + .setPositiveButton(R.string.ok) { _, _ -> + event.isDone = isChecked + launch(Dispatchers.Default) { + app.db.eventDao().replace(event) + } + update() + b.checkDoneButton.isChecked = true + } + .setNegativeButton(R.string.cancel, null) + .show() + } + else if (!isChecked && event.isDone) { + event.isDone = isChecked + launch(Dispatchers.Default) { + app.db.eventDao().replace(event) + } + update() + } + } + b.checkDoneButton.attachToastHint(R.string.hint_mark_as_done) + + // EDIT EVENT + b.editButton.visibility = if (event.addedManually) View.VISIBLE else View.GONE + b.editButton.setOnClickListener { + EventManualDialog( + activity, + event.profileId, + editingEvent = event, + onSaveListener = { + if (it == null) { + dialog.dismiss() + return@EventManualDialog + } + event = it + update() + }, + onShowListener = onShowListener, + onDismissListener = onDismissListener + ) + } + b.editButton.attachToastHint(R.string.hint_edit_event) + + // SAVE IN CALENDAR + b.saveInCalendarButton.onClick { + openInCalendar() + } + b.saveInCalendarButton.attachToastHint(R.string.hint_save_in_calendar) + + // GO TO TIMETABLE + b.goToTimetableButton.onClick { + dialog.dismiss() + val dateStr = event.date.stringY_m_d + + val intent = + if (activity is MainActivity && activity.navTargetId == MainActivity.DRAWER_ITEM_TIMETABLE) + Intent(TimetableFragment.ACTION_SCROLL_TO_DATE) + else if (activity is MainActivity) + Intent("android.intent.action.MAIN") + else + Intent(activity, MainActivity::class.java) + + intent.apply { + putExtra("fragmentId", MainActivity.DRAWER_ITEM_TIMETABLE) + putExtra("timetableDate", dateStr) + } + if (activity is MainActivity) + activity.sendBroadcast(intent) + else + activity.startActivity(intent) + } + b.goToTimetableButton.attachToastHint(R.string.hint_go_to_timetable) + + // RE-DOWNLOAD + b.downloadButton.isVisible = App.devMode + b.downloadButton.onClick { + EdziennikTask.eventGet(event.profileId, event).enqueue(activity) + } + b.downloadButton.attachToastHint(R.string.hint_download_again) + + BetterLink.attach(b.topic, onActionSelected = dialog::dismiss) + + event.teacherName?.let { name -> + BetterLink.attach( + b.teacherName, + teachers = mapOf(event.teacherId to name), + onActionSelected = dialog::dismiss + ) + } + + if (event.homeworkBody == null && !event.addedManually && event.type == Event.TYPE_HOMEWORK) { + b.bodyTitle.isVisible = true + b.bodyProgressBar.isVisible = true + b.body.isVisible = false + EdziennikTask.eventGet(event.profileId, event).enqueue(activity) + } + else if (event.homeworkBody.isNullOrBlank()) { + b.bodyTitle.isVisible = false + b.bodyProgressBar.isVisible = false + b.body.isVisible = false + } + else { + b.bodyTitle.isVisible = true + b.bodyProgressBar.isVisible = false + b.body.isVisible = true + BetterLink.attach(b.body, onActionSelected = dialog::dismiss) + } + + if (event.attachmentIds.isNullOrEmpty() || event.attachmentNames.isNullOrEmpty()) { + b.attachmentsTitle.isVisible = false + b.attachmentsFragment.isVisible = false + } + else { + b.attachmentsTitle.isVisible = true + b.attachmentsFragment.isVisible = true + b.attachmentsFragment.init(Bundle().also { + it.putInt("profileId", event.profileId) + it.putLongArray("attachmentIds", event.attachmentIds!!.toLongArray()) + it.putStringArray("attachmentNames", event.attachmentNames!!.toTypedArray()) + }, owner = event) + } + } + + @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) + fun onEventGetEvent(event: EventGetEvent) { + EventBus.getDefault().removeStickyEvent(event) + if (event.event.homeworkBody == null) + event.event.homeworkBody = "" + update() + } + + private fun showRemovingProgressDialog() { + if (progressDialog != null) { + return + } + + progressDialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.please_wait) + .setMessage(R.string.event_removing_text) + .setCancelable(false) + .show() + } + + private fun showRemoveEventDialog() { + val shareNotice = when { + eventShared && eventOwn -> "\n\n"+activity.getString(R.string.dialog_event_manual_remove_shared_self) + eventShared && !eventOwn -> "\n\n"+activity.getString(R.string.dialog_event_manual_remove_shared) + else -> "" + } + removeEventDialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.are_you_sure) + .setMessage(activity.getString(R.string.dialog_register_event_manual_remove_confirmation)+shareNotice) + .setPositiveButton(R.string.yes, null) + .setNegativeButton(R.string.no) { dialog, _ -> dialog.dismiss() } + .create() + .apply { + setOnShowListener { dialog -> + val positiveButton = (dialog as AlertDialog).getButton(AlertDialog.BUTTON_POSITIVE) + positiveButton?.setOnClickListener { + removeEvent() + } + } + + show() + } + } + + private fun removeEvent() { + launch { + if (eventShared && eventOwn) { + // unshare + remove own event + showRemovingProgressDialog() + + api.runCatching(activity) { + unshareEvent(event) + } ?: run { + progressDialog?.dismiss() + return@launch + } + + finishRemoving() + } else if (eventShared && !eventOwn) { + // remove + blacklist somebody's event + Toast.makeText(activity, "Nie zaimplementowana opcja :(", Toast.LENGTH_SHORT).show() + // TODO + } else { + // remove event + Toast.makeText(activity, R.string.event_manual_remove, Toast.LENGTH_SHORT).show() + finishRemoving() + } + progressDialog?.dismiss() + } + } + + private fun finishRemoving() { + launch { + withContext(Dispatchers.Default) { + app.db.eventDao().remove(event) + } + } + + removeEventDialog?.dismiss() + dialog.dismiss() + Toast.makeText(activity, R.string.removed, Toast.LENGTH_SHORT).show() + } + + private fun openInCalendar() { launch { + val title = event.typeName ?: "" + + (if (event.typeName.isNotNullNorBlank() && event.subjectLongName.isNotNullNorBlank()) " - " else " ") + + (event.subjectLongName ?: "") + + val intent = Intent(Intent.ACTION_EDIT).apply { + data = Events.CONTENT_URI + putExtra(Events.TITLE, title) + putExtra(Events.DESCRIPTION, event.topic) + + if (event.time == null) { + putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, true) + putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, event.date.inMillis) + putExtra(CalendarContract.EXTRA_EVENT_END_TIME, event.date.inMillis) + } else { + val startTime = event.date.combineWith(event.time) + val endTime = startTime + 45 * 60 * 1000 /* 45 min */ + + putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, false) + putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, startTime) + putExtra(CalendarContract.EXTRA_EVENT_END_TIME, endTime) + } + } + + try { + activity.startActivity(intent) + } catch (e: ActivityNotFoundException) { + Toast.makeText(activity, R.string.calendar_app_not_found, Toast.LENGTH_SHORT).show() + } + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListAdapter.kt index 8106f64f..9bb199ea 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListAdapter.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListAdapter.kt @@ -6,21 +6,39 @@ package pl.szczodrzynski.edziennik.ui.dialogs.event import android.content.Context import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup +import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull +import pl.szczodrzynski.edziennik.data.db.full.EventFull import pl.szczodrzynski.edziennik.databinding.EventListItemBinding import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Week +import kotlin.coroutines.CoroutineContext class EventListAdapter( val context: Context, + val simpleMode: Boolean = false, + val showWeekDay: Boolean = false, + val showDate: Boolean = false, + val showType: Boolean = true, + val showTime: Boolean = true, + val showSubject: Boolean = true, + val markAsSeen: Boolean = true, val onItemClick: ((event: EventFull) -> Unit)? = null, val onEventEditClick: ((event: EventFull) -> Unit)? = null -) : RecyclerView.Adapter() { +) : RecyclerView.Adapter(), CoroutineScope { - private val app by lazy { context.applicationContext as App } + private val app = context.applicationContext as App + private val manager + get() = app.eventManager + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main var items = listOf() @@ -33,72 +51,73 @@ class EventListAdapter( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val event = items[position] val b = holder.b + val manager = app.eventManager b.root.onClick { onItemClick?.invoke(event) + if (!event.seen) { + manager.markAsSeen(event) + } + if (event.showAsUnseen == true) { + event.showAsUnseen = false + notifyItemChanged(event) + } } val bullet = " • " - b.topic.text = event.topic + b.simpleMode = simpleMode + + manager.setEventTopic(b.topic, event, showType = false) + b.topic.maxLines = if (simpleMode) 2 else 3 b.details.text = mutableListOf( - event.typeName, - event.startTime?.stringHM ?: app.getString(R.string.event_all_day), - event.subjectLongName + if (showWeekDay) Week.getFullDayName(event.date.weekDay) else null, + if (showDate) event.date.getRelativeString(context, 7) ?: event.date.formattedStringShort else null, + if (showType) event.typeName else null, + if (showTime) event.time?.stringHM ?: app.getString(R.string.event_all_day) else null, + if (showSubject) event.subjectLongName else null ).concat(bullet) b.addedBy.setText( when (event.sharedBy) { null -> when { event.addedManually -> R.string.event_list_added_by_self_format - event.teacherFullName == null -> R.string.event_list_added_by_unknown_format + event.teacherName == null -> R.string.event_list_added_by_unknown_format else -> R.string.event_list_added_by_format } "self" -> R.string.event_list_shared_by_self_format else -> R.string.event_list_shared_by_format }, Date.fromMillis(event.addedDate).formattedString, - event.sharedByName ?: event.teacherFullName ?: "", + event.sharedByName ?: event.teacherName ?: "", event.teamName?.let { bullet+it } ?: "" ) - b.typeColor.background?.setTintColor(event.getColor()) + b.typeColor.background?.setTintColor(event.eventColor) + b.typeColor.isVisible = showType - b.editButton.visibility = if (event.addedManually) View.VISIBLE else View.GONE + b.editButton.isVisible = !simpleMode && event.addedManually && !event.isDone b.editButton.onClick { onEventEditClick?.invoke(event) } + b.editButton.attachToastHint(R.string.hint_edit_event) - /*with(holder) { - b.eventListItemRoot.background.colorFilter = when (event.type) { - Event.TYPE_HOMEWORK -> PorterDuffColorFilter(0xffffffff.toInt(), PorterDuff.Mode.CLEAR) - else -> PorterDuffColorFilter(event.color, PorterDuff.Mode.MULTIPLY) - } + if (event.showAsUnseen == null) + event.showAsUnseen = !event.seen - b.eventListItemStartTime.text = if (event.startTime == null) app.getString(R.string.event_all_day) else event.startTime?.stringHM - b.eventListItemTeamName.text = bs(event.teamName) - b.eventListItemTeacherName.text = app.getString(R.string.concat_2_strings, bs(null, event.teacherFullName, "\n"), bs(event.subjectLongName)) - b.eventListItemAddedDate.text = Date.fromMillis(event.addedDate).formattedStringShort - b.eventListItemType.text = event.typeName - b.eventListItemTopic.text = event.topic - b.eventListItemHomework.visibility = if (event.type == Event.TYPE_HOMEWORK) View.VISIBLE else View.GONE - b.eventListItemSharedBy.text = app.getString(R.string.event_shared_by_format, if (event.sharedBy == "self") app.getString(R.string.event_shared_by_self) else event.sharedByName) - b.eventListItemSharedBy.visibility = if (event.sharedByName.isNullOrBlank()) View.GONE else View.VISIBLE + b.unread.isVisible = event.showAsUnseen == true + if (markAsSeen && !event.seen) { + manager.markAsSeen(event) + } + } - b.eventListItemEdit.visibility = if (event.addedManually) View.VISIBLE else View.GONE - b.eventListItemEdit.setOnClickListener { - parentDialog.dismiss() - - EventManualDialog( - context as MainActivity, - event.profileId, - editingEvent = event, - onShowListener = parentDialog.onShowListener, - onDismissListener = parentDialog.onDismissListener - ) - } - }*/ + private fun notifyItemChanged(model: Any) { + startCoroutineTimer(1000L, 0L) { + val index = items.indexOf(model) + if (index != -1) + notifyItemChanged(index) + } } override fun getItemCount() = items.size diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.kt deleted file mode 100644 index e5690648..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventListDialog.kt +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-11-30 - */ - -package pl.szczodrzynski.edziennik.ui.dialogs.event - -import android.graphics.Typeface -import android.view.View -import android.widget.Toast -import androidx.appcompat.app.AlertDialog -import androidx.appcompat.app.AppCompatActivity -import androidx.lifecycle.Observer -import androidx.recyclerview.widget.LinearLayoutManager -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson -import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull -import pl.szczodrzynski.edziennik.databinding.DialogEventListBinding -import pl.szczodrzynski.edziennik.utils.models.Date -import pl.szczodrzynski.edziennik.utils.models.Time -import kotlin.coroutines.CoroutineContext - -class EventListDialog( - val activity: AppCompatActivity, - val profileId: Int, - val date: Date, - val time: Time? = null, - val onShowListener: ((tag: String) -> Unit)? = null, - val onDismissListener: ((tag: String) -> Unit)? = null -) : CoroutineScope { - - companion object { - const val TAG = "EventListDialog" - } - - private lateinit var job: Job - override val coroutineContext: CoroutineContext - get() = job + Dispatchers.Main - - private val app by lazy { activity.application as App } - private lateinit var b: DialogEventListBinding - private lateinit var dialog: AlertDialog - private lateinit var adapter: EventListAdapter - - private var lesson: LessonFull? = null - - init { - run { - if (activity.isFinishing) - return@run - job = Job() - onShowListener?.invoke(TAG) - b = DialogEventListBinding.inflate(activity.layoutInflater) - - dialog = MaterialAlertDialogBuilder(activity) - .setTitle(date.formattedString + (time?.let { ", " + it.stringHM } ?: "")) - .setView(b.root) - .setPositiveButton(R.string.close) { dialog, _ -> dialog.dismiss() } - .setNeutralButton(R.string.add) { _, _ -> - EventManualDialog( - activity, - lesson?.profileId ?: profileId, - lesson, - date, - time, - onShowListener = onShowListener, - onDismissListener = onDismissListener - ) - } - .setOnDismissListener { - onDismissListener?.invoke(TAG) - } - .show() - - app.db.timetableDao().getForDate(profileId, date).observe(activity, Observer { lessons -> - lesson = lessons.firstOrNull { it.displayStartTime == time } - update() - }) - } - } - - fun dismiss() = dialog.dismiss() - - private fun update() { - b.eventListLessonDetails.visibility = if (lesson == null) View.GONE else View.VISIBLE - - if (lesson != null) { - dialog.setTitle(if (time == null) date.formattedString else (lesson?.displaySubjectName - ?: date.formattedString) + ", " + time.stringHM) - - b.eventListLessonDate.text = app.getString(R.string.date_time_format, date.formattedString, "") - - if (lesson?.type == Lesson.TYPE_CANCELLED) { - b.eventListLessonChange.text = app.getString(R.string.lesson_cancelled) - b.eventListLessonChange.setTypeface(null, Typeface.BOLD_ITALIC) - b.eventListTeacher.visibility = View.GONE - b.eventListClassroom.visibility = View.GONE - } else { - b.eventListLessonChange.text = lesson?.changeSubjectName - b.eventListLessonChange.setTypeface(null, Typeface.ITALIC) - b.eventListLessonChange.visibility = if (lesson?.isSubjectNameChanged == true) View.VISIBLE else View.GONE - - b.eventListTeacher.text = lesson?.changeTeacherName - b.eventListTeacher.setTypeface(null, if (lesson?.isTeacherNameChanged == true) Typeface.ITALIC else Typeface.NORMAL) - - b.eventListClassroom.text = lesson?.changeClassroom - b.eventListClassroom.setTypeface(null, if (lesson?.isClassroomChanged == true) Typeface.ITALIC else Typeface.NORMAL) - } - } - - b.eventListView.apply { - setHasFixedSize(false) - isNestedScrollingEnabled = true - layoutManager = LinearLayoutManager(activity) - } - - adapter = EventListAdapter(activity) { - Toast.makeText(activity, "Event clicked ${it.topic}", Toast.LENGTH_SHORT).show() - } - b.eventListView.adapter = adapter - - app.db.eventDao().getAllByDateTime(profileId, date, time).observe(activity, Observer { events -> - if (events.isNullOrEmpty()) { - b.eventListView.visibility = View.GONE - b.textNoEvents.visibility = View.VISIBLE - } else { - adapter.run { - /*items.apply { - clear() - addAll(events) - }*/ - notifyDataSetChanged() - } - } - }) - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt index fe529f5c..da684520 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialog.kt @@ -4,36 +4,34 @@ package pl.szczodrzynski.edziennik.ui.dialogs.event -import android.graphics.PorterDuff -import android.graphics.PorterDuffColorFilter import android.view.View import android.widget.Toast import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog.BUTTON_NEUTRAL import androidx.appcompat.app.AlertDialog.BUTTON_POSITIVE import androidx.appcompat.app.AppCompatActivity -import androidx.lifecycle.Observer -import com.google.android.material.datepicker.MaterialDatePicker import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.jaredrummler.android.colorpicker.ColorPickerDialog import com.jaredrummler.android.colorpicker.ColorPickerDialogListener import kotlinx.coroutines.* +import org.greenrobot.eventbus.EventBus +import org.greenrobot.eventbus.Subscribe +import org.greenrobot.eventbus.ThreadMode import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.task.SzkolnyTask -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull -import pl.szczodrzynski.edziennik.data.db.modules.events.EventType -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team -import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson -import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask +import pl.szczodrzynski.edziennik.data.api.events.ApiTaskAllFinishedEvent +import pl.szczodrzynski.edziennik.data.api.events.ApiTaskErrorEvent +import pl.szczodrzynski.edziennik.data.api.events.ApiTaskFinishedEvent +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi +import pl.szczodrzynski.edziennik.data.db.entity.* +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.data.db.full.LessonFull import pl.szczodrzynski.edziennik.databinding.DialogEventManualV2Binding +import pl.szczodrzynski.edziennik.ui.dialogs.sync.RegistrationConfigDialog +import pl.szczodrzynski.edziennik.ui.modules.views.TimeDropdown.Companion.DISPLAY_LESSONS import pl.szczodrzynski.edziennik.utils.Anim -import pl.szczodrzynski.edziennik.utils.TextInputDropDown import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time -import pl.szczodrzynski.edziennik.utils.models.Week import kotlin.coroutines.CoroutineContext class EventManualDialog( @@ -42,8 +40,9 @@ class EventManualDialog( val defaultLesson: LessonFull? = null, val defaultDate: Date? = null, val defaultTime: Time? = null, - val defaultType: Int? = null, + val defaultType: Long? = null, val editingEvent: EventFull? = null, + val onSaveListener: ((event: EventFull?) -> Unit)? = null, val onShowListener: ((tag: String) -> Unit)? = null, val onDismissListener: ((tag: String) -> Unit)? = null ) : CoroutineScope { @@ -52,26 +51,34 @@ class EventManualDialog( private const val TAG = "EventManualDialog" } - private lateinit var job: Job + private val job: Job = Job() override val coroutineContext: CoroutineContext get() = job + Dispatchers.Main private val app by lazy { activity.application as App } private lateinit var b: DialogEventManualV2Binding private lateinit var dialog: AlertDialog - private var removeEventDialog: AlertDialog? = null - private var defaultLoaded = false + private lateinit var profile: Profile - private lateinit var event: Event private var customColor: Int? = null private val editingShared = editingEvent?.sharedBy != null private val editingOwn = editingEvent?.sharedBy == "self" + private var removeEventDialog: AlertDialog? = null - init { run { + private val api by lazy { + SzkolnyApi(app) + } + + private var enqueuedWeekDialog: AlertDialog? = null + private var enqueuedWeekStart = Date.getToday() + + private var progressDialog: AlertDialog? = null + + init { launch { if (activity.isFinishing) - return@run - job = Job() + return@launch onShowListener?.invoke(TAG) + EventBus.getDefault().register(this@EventManualDialog) b = DialogEventManualV2Binding.inflate(activity.layoutInflater) dialog = MaterialAlertDialogBuilder(activity) .setTitle(R.string.dialog_event_manual_title) @@ -85,7 +92,11 @@ class EventManualDialog( } .setOnDismissListener { onDismissListener?.invoke(TAG) + EventBus.getDefault().unregister(this@EventManualDialog) + enqueuedWeekDialog?.dismiss() + progressDialog?.dismiss() } + .setCancelable(false) .create() .apply { setOnShowListener { dialog -> @@ -103,12 +114,6 @@ class EventManualDialog( show() } - event = editingEvent?.clone() ?: Event().also { event -> - event.profileId = profileId - defaultType?.let { - event.type = it - } - } b.shareSwitch.isChecked = editingShared b.shareSwitch.isEnabled = !editingShared || (editingShared && editingOwn) @@ -143,93 +148,210 @@ class EventManualDialog( else -> R.string.dialog_event_manual_share_first_notice } - b.shareDetails.setText(text) + b.shareDetails.setText(text, editingEvent?.sharedByName ?: "") } - private fun loadLists() { launch { - val deferred = async(Dispatchers.Default) { - // get the team list - val teams = app.db.teamDao().getAllNow(profileId) - b.teamDropdown.clear() - b.teamDropdown += TextInputDropDown.Item( - -1, - activity.getString(R.string.dialog_event_manual_no_team), - "" - ) - b.teamDropdown += teams.map { TextInputDropDown.Item(it.id, it.name, tag = it) } - - // get the subject list - val subjects = app.db.subjectDao().getAllNow(profileId) - b.subjectDropdown.clear() - b.subjectDropdown += TextInputDropDown.Item( - -1, - activity.getString(R.string.dialog_event_manual_no_subject), - "" - ) - b.subjectDropdown += subjects.map { TextInputDropDown.Item(it.id, it.longName, tag = it) } - - // get the teacher list - val teachers = app.db.teacherDao().getAllNow(profileId) - b.teacherDropdown.clear() - b.teacherDropdown += TextInputDropDown.Item( - -1, - activity.getString(R.string.dialog_event_manual_no_teacher), - "" - ) - b.teacherDropdown += teachers.map { TextInputDropDown.Item(it.id, it.fullName, tag = it) } - - // get the event type list - val eventTypes = app.db.eventTypeDao().getAllNow(profileId) - b.typeDropdown.clear() - b.typeDropdown += eventTypes.map { TextInputDropDown.Item(it.id, it.name, tag = it) } + private fun syncTimetable(date: Date) { + if (enqueuedWeekDialog != null) { + return } - deferred.await() + if (app.profile.getStudentData("timetableNotPublic", false)) { + return + } + val weekStart = date.weekStart + enqueuedWeekDialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.please_wait) + .setMessage(R.string.timetable_syncing_text) + .setCancelable(false) + .show() - b.teamDropdown.isEnabled = true - b.subjectDropdown.isEnabled = true - b.teacherDropdown.isEnabled = true - b.typeDropdown.isEnabled = true + enqueuedWeekStart = weekStart - defaultType?.let { - b.typeDropdown.select(it.toLong()) + EdziennikTask.syncProfile( + profileId = profileId, + viewIds = listOf( + MainActivity.DRAWER_ITEM_TIMETABLE to 0 + ), + arguments = JsonObject( + "weekStart" to weekStart.stringY_m_d + ) + ).enqueue(activity) + } + + private fun showSharingProgressDialog() { + if (progressDialog != null) { + return } - b.typeDropdown.selected?.let { item -> - customColor = (item.tag as EventType).color + progressDialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.please_wait) + .setMessage(R.string.event_sharing_text) + .setCancelable(false) + .show() + } + + private fun showRemovingProgressDialog() { + if (progressDialog != null) { + return } - // copy IDs from event being edited - editingEvent?.let { - b.teamDropdown.select(it.teamId) - b.subjectDropdown.select(it.subjectId) - b.teacherDropdown.select(it.teacherId) - b.topic.setText(it.topic) - b.typeDropdown.select(it.type.toLong())?.let { item -> - customColor = (item.tag as EventType).color + progressDialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.please_wait) + .setMessage(R.string.event_removing_text) + .setCancelable(false) + .show() + } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun onApiTaskFinishedEvent(event: ApiTaskFinishedEvent) { + if (event.profileId == profileId) { + enqueuedWeekDialog?.dismiss() + enqueuedWeekDialog = null + progressDialog?.dismiss() + launch { + b.timeDropdown.loadItems() + b.timeDropdown.selectDefault(editingEvent?.time) + b.timeDropdown.selectDefault(defaultLesson?.displayStartTime ?: defaultTime) } + } + } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun onApiTaskAllFinishedEvent(event: ApiTaskAllFinishedEvent) { + enqueuedWeekDialog?.dismiss() + enqueuedWeekDialog = null + progressDialog?.dismiss() + } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun onApiTaskErrorEvent(event: ApiTaskErrorEvent) { + enqueuedWeekDialog?.dismiss() + enqueuedWeekDialog = null + progressDialog?.dismiss() + } + + private fun loadLists() = launch { + val profile = withContext(Dispatchers.Default) { + app.db.profileDao().getByIdNow(profileId) + } + if (profile == null) { + Toast.makeText(activity, R.string.event_manual_no_profile, Toast.LENGTH_SHORT).show() + return@launch + } + this@EventManualDialog.profile = profile + + with (b.dateDropdown) { + db = app.db + profileId = this@EventManualDialog.profileId + showWeekDays = false + showDays = true + showOtherDate = true + defaultLesson?.let { + nextLessonSubjectId = it.displaySubjectId + nextLessonSubjectName = it.displaySubjectName + nextLessonTeamId = it.displayTeamId + } + loadItems() + selectDefault(editingEvent?.date) + selectDefault(defaultLesson?.displayDate ?: defaultDate) + onDateSelected = { date, lesson -> + b.timeDropdown.deselect() + b.timeDropdown.lessonsDate = date + this@EventManualDialog.launch { + if (!b.timeDropdown.loadItems()) + syncTimetable(date) + lesson?.displayStartTime?.let { b.timeDropdown.selectTime(it) } + lesson?.displaySubjectId?.let { b.subjectDropdown.selectSubject(it) } ?: b.subjectDropdown.deselect() + lesson?.displayTeacherId?.let { b.teacherDropdown.selectTeacher(it) } ?: b.teacherDropdown.deselect() + lesson?.displayTeamId?.let { b.teamDropdown.selectTeam(it) } ?: b.teamDropdown.selectTeamClass() + } + } + } + + with (b.timeDropdown) { + db = app.db + profileId = this@EventManualDialog.profileId + showAllDay = true + showCustomTime = true + lessonsDate = b.dateDropdown.getSelected() as? Date ?: Date.getToday() + displayMode = DISPLAY_LESSONS + if (!loadItems()) + syncTimetable(lessonsDate ?: Date.getToday()) + selectDefault(editingEvent?.time) + if (editingEvent != null && editingEvent.time == null) + select(0L) + selectDefault(defaultLesson?.displayStartTime ?: defaultTime) + onLessonSelected = { lesson -> + lesson.displaySubjectId?.let { b.subjectDropdown.selectSubject(it) } ?: b.subjectDropdown.deselect() + lesson.displayTeacherId?.let { b.teacherDropdown.selectTeacher(it) } ?: b.teacherDropdown.deselect() + lesson.displayTeamId?.let { b.teamDropdown.selectTeam(it) } ?: b.teamDropdown.selectTeamClass() + } + } + + with (b.teamDropdown) { + db = app.db + profileId = this@EventManualDialog.profileId + showNoTeam = true + loadItems() + selectTeamClass() + selectDefault(editingEvent?.teamId) + selectDefault(defaultLesson?.displayTeamId) + } + + with (b.subjectDropdown) { + db = app.db + profileId = this@EventManualDialog.profileId + showNoSubject = true + showCustomSubject = false + loadItems() + selectDefault(editingEvent?.subjectId) + selectDefault(defaultLesson?.displaySubjectId) + } + + with (b.teacherDropdown) { + db = app.db + profileId = this@EventManualDialog.profileId + showNoTeacher = true + loadItems() + selectDefault(editingEvent?.teacherId) + selectDefault(defaultLesson?.displayTeacherId) + } + + with (b.typeDropdown) { + db = app.db + profileId = this@EventManualDialog.profileId + loadItems() + selectDefault(editingEvent?.type) + selectDefault(defaultType) + + onTypeSelected = { + b.typeColor.background.setTintColor(it.color) + customColor = null + } + } + + // copy data from event being edited + editingEvent?.let { + b.topic.setText(it.topic) if (it.color != -1) customColor = it.color } + b.typeColor.background.setTintColor( + customColor + ?: b.typeDropdown.getSelected()?.color + ?: Event.COLOR_DEFAULT + ) + // copy IDs from the LessonFull defaultLesson?.let { b.teamDropdown.select(it.displayTeamId) - b.subjectDropdown.select(it.displaySubjectId) - b.teacherDropdown.select(it.displayTeacherId) - } - - b.typeDropdown.setOnChangeListener { - b.typeColor.background.colorFilter = PorterDuffColorFilter((it.tag as EventType).color, PorterDuff.Mode.SRC_ATOP) - customColor = null - return@setOnChangeListener true - } - - (customColor ?: Event.COLOR_DEFAULT).let { - b.typeColor.background.colorFilter = PorterDuffColorFilter(it, PorterDuff.Mode.SRC_ATOP) } b.typeColor.onClick { - val currentColor = (b.typeDropdown?.selected?.tag as EventType?)?.color ?: Event.COLOR_DEFAULT + val currentColor = customColor + ?: b.typeDropdown.getSelected()?.color + ?: Event.COLOR_DEFAULT val colorPickerDialog = ColorPickerDialog.newBuilder() .setColor(currentColor) .create() @@ -237,295 +359,12 @@ class EventManualDialog( object : ColorPickerDialogListener { override fun onDialogDismissed(dialogId: Int) {} override fun onColorSelected(dialogId: Int, color: Int) { - b.typeColor.background.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) + b.typeColor.background.setTintColor(color) customColor = color } }) - colorPickerDialog.show(activity.fragmentManager, "color-picker-dialog") + colorPickerDialog.show(activity.supportFragmentManager, "color-picker-dialog") } - - loadDates() - }} - - private fun loadDates() { launch { - val date = Date.getToday() - val today = date.value - var weekDay = date.weekDay - - val deferred = async(Dispatchers.Default) { - val dates = mutableListOf() - // item choosing the next lesson of specific subject - b.subjectDropdown.selected?.let { - if (it.tag is Subject) { - dates += TextInputDropDown.Item( - -it.id, - activity.getString(R.string.dialog_event_manual_date_next_lesson, it.tag.longName) - ) - } - } - - // TODAY - dates += TextInputDropDown.Item( - date.value.toLong(), - activity.getString(R.string.dialog_event_manual_date_today, date.formattedString), - tag = date.clone() - ) - - // TOMORROW - if (weekDay < 4) { - date.stepForward(0, 0, 1) - weekDay++ - dates += TextInputDropDown.Item( - date.value.toLong(), - activity.getString(R.string.dialog_event_manual_date_tomorrow, date.formattedString), - tag = date.clone() - ) - } - // REMAINING SCHOOL DAYS OF THE CURRENT WEEK - while (weekDay < 4) { - date.stepForward(0, 0, 1) // step one day forward - weekDay++ - dates += TextInputDropDown.Item( - date.value.toLong(), - activity.getString(R.string.dialog_event_manual_date_this_week, Week.getFullDayName(weekDay), date.formattedString), - tag = date.clone() - ) - } - // go to next week Monday - date.stepForward(0, 0, -weekDay + 7) - weekDay = 0 - // ALL SCHOOL DAYS OF THE NEXT WEEK - while (weekDay < 4) { - dates += TextInputDropDown.Item( - date.value.toLong(), - activity.getString(R.string.dialog_event_manual_date_next_week, Week.getFullDayName(weekDay), date.formattedString), - tag = date.clone() - ) - date.stepForward(0, 0, 1) // step one day forward - weekDay++ - } - dates += TextInputDropDown.Item( - -1L, - activity.getString(R.string.dialog_event_manual_date_other) - ) - dates - } - - val dates = deferred.await() - b.dateDropdown.clear().append(dates) - - defaultDate?.let { - event.eventDate = it - if (b.dateDropdown.select(it) == null) - b.dateDropdown.select(TextInputDropDown.Item( - it.value.toLong(), - it.formattedString, - tag = it - )) - } - - editingEvent?.eventDate?.let { - b.dateDropdown.select(TextInputDropDown.Item( - it.value.toLong(), - it.formattedString, - tag = it - )) - } - - defaultLesson?.displayDate?.let { - b.dateDropdown.select(TextInputDropDown.Item( - it.value.toLong(), - it.formattedString, - tag = it - )) - } - - if (b.dateDropdown.selected == null) { - b.dateDropdown.select(today.toLong()) - } - - b.dateDropdown.isEnabled = true - - b.dateDropdown.setOnChangeListener { item -> - when { - // next lesson with specified subject - item.id < -1 -> { - val teamId = defaultLesson?.teamId ?: -1 - val selectedLessonDate = defaultLesson?.date ?: Date.getToday() - - when (teamId) { - -1L -> app.db.timetableDao().getNextWithSubject(profileId, selectedLessonDate, -item.id) - else -> app.db.timetableDao().getNextWithSubjectAndTeam(profileId, selectedLessonDate, -item.id, teamId) - }.observeOnce(activity, Observer { - val lessonDate = it?.displayDate ?: return@Observer - b.dateDropdown.select(TextInputDropDown.Item( - lessonDate.value.toLong(), - lessonDate.formattedString, - tag = lessonDate - )) - b.teamDropdown.select(it.displayTeamId) - b.subjectDropdown.select(it.displaySubjectId) - b.teacherDropdown.select(it.displayTeacherId) - defaultLoaded = false - loadHours(it.displayStartTime) - }) - return@setOnChangeListener false - } - // custom date - item.id == -1L -> { - MaterialDatePicker.Builder - .datePicker() - .setSelection((b.dateDropdown.selectedId?.let { Date.fromValue(it.toInt()) } - ?: Date.getToday()).inMillis) - .build() - .apply { - addOnPositiveButtonClickListener { - val dateSelected = Date.fromMillis(it) - b.dateDropdown.select(TextInputDropDown.Item( - dateSelected.value.toLong(), - dateSelected.formattedString, - tag = dateSelected - )) - loadHours() - } - show(this@EventManualDialog.activity.supportFragmentManager, "MaterialDatePicker") - } - - return@setOnChangeListener false - } - // a specific date - else -> { - b.dateDropdown.select(item) - loadHours() - } - } - return@setOnChangeListener true - } - - loadHours() - }} - - private fun loadHours(defaultHour: Time? = null) { - b.timeDropdown.isEnabled = false - // get the selected date - val date = b.dateDropdown.selectedId?.let { Date.fromValue(it.toInt()) } ?: return - // get all lessons for selected date - app.db.timetableDao().getForDate(profileId, date).observeOnce(activity, Observer { lessons -> - val hours = mutableListOf() - // add All day time choice - hours += TextInputDropDown.Item( - 0L, - activity.getString(R.string.dialog_event_manual_all_day) - ) - lessons.forEach { lesson -> - if (lesson.type == Lesson.TYPE_NO_LESSONS) { - // indicate there are no lessons this day - hours += TextInputDropDown.Item( - -2L, - activity.getString(R.string.dialog_event_manual_no_lessons) - ) - return@forEach - } - // create the lesson caption - val text = listOfNotEmpty( - lesson.displayStartTime?.stringHM ?: "", - lesson.displaySubjectName?.let { - when { - lesson.type == Lesson.TYPE_CANCELLED - || lesson.type == Lesson.TYPE_SHIFTED_SOURCE -> it.asStrikethroughSpannable() - lesson.type != Lesson.TYPE_NORMAL -> it.asItalicSpannable() - else -> it - } - } ?: "" - ) - // add an item with LessonFull as the tag - hours += TextInputDropDown.Item( - lesson.displayStartTime?.value?.toLong() ?: -1, - text.concat(" "), - tag = lesson - ) - } - b.timeDropdown.clear().append(hours) - - if (defaultLoaded) { - b.timeDropdown.deselect() - // select the TEAM_CLASS if possible - b.teamDropdown.items.singleOrNull { - it.tag is Team && it.tag.type == Team.TYPE_CLASS - }?.let { - b.teamDropdown.select(it) - } ?: b.teamDropdown.deselect() - - // clear subject, teacher selection - b.subjectDropdown.deselect() - b.teacherDropdown.deselect() - } - else { - defaultTime?.let { - event.startTime = it - if (b.timeDropdown.select(it) == null) - b.timeDropdown.select(TextInputDropDown.Item( - it.value.toLong(), - it.stringHM, - tag = it - )) - } - - editingEvent?.startTime?.let { - if (b.timeDropdown.select(it) == null) - b.timeDropdown.select(TextInputDropDown.Item( - it.value.toLong(), - it.stringHM, - tag = it - )) - } - - defaultLesson?.let { - b.timeDropdown.select(it.displayStartTime?.value?.toLong()) - } - - defaultHour?.let { - b.timeDropdown.select(it.value.toLong()) - } - } - defaultLoaded = true - b.timeDropdown.isEnabled = true - - // attach a listener to time dropdown - b.timeDropdown.setOnChangeListener { item -> - when (item.id) { - // no lessons this day - -2L -> { - b.timeDropdown.deselect() - return@setOnChangeListener false - } - - // custom start hour - -1L -> return@setOnChangeListener false - - // selected a specific lesson - else -> { - if (item.tag is LessonFull) { - // update team, subject, teacher dropdowns, - // using the LessonFull from item tag - b.teamDropdown.deselect() - b.subjectDropdown.deselect() - b.teacherDropdown.deselect() - item.tag.displayTeamId?.let { - b.teamDropdown.select(it) - } - item.tag.displaySubjectId?.let { - b.subjectDropdown.select(it) - } - item.tag.displayTeacherId?.let { - b.teacherDropdown.select(it) - } - } - } - } - return@setOnChangeListener true - } - }) } private fun showRemoveEventDialog() { @@ -553,95 +392,143 @@ class EventManualDialog( } private fun saveEvent() { - val date = b.dateDropdown.selected?.tag.instanceOfOrNull() - val lesson = b.timeDropdown.selected?.tag.instanceOfOrNull() - val teamId = b.teamDropdown.selected?.id - val type = b.typeDropdown.selected?.id + val date = b.dateDropdown.getSelected() as? Date + val timeSelected = b.timeDropdown.getSelected() + val team = b.teamDropdown.getSelected() + val type = b.typeDropdown.getSelected() val topic = b.topic.text?.toString() - val subjectId = b.subjectDropdown.selected?.id - val teacherId = b.teacherDropdown.selected?.id + val subject = b.subjectDropdown.getSelected() as? Subject + val teacher = b.teacherDropdown.getSelected() val share = b.shareSwitch.isChecked + if (share && profile.registration != Profile.REGISTRATION_ENABLED) { + RegistrationConfigDialog(activity, profile, onChangeListener = { enabled -> + if (enabled) + saveEvent() + }).showEventShareDialog() + return + } + + b.dateDropdown.error = null b.teamDropdown.error = null b.typeDropdown.error = null b.topic.error = null var isError = false - if (share && teamId == null) { + if (date == null) { + b.dateDropdown.error = app.getString(R.string.dialog_event_manual_date_choose) + b.dateDropdown.requestFocus() + isError = true + } + + if (timeSelected !is Pair<*, *> && timeSelected != 0L) { + b.timeDropdown.error = app.getString(R.string.dialog_event_manual_time_choose) + if (!isError) b.timeDropdown.parent.requestChildFocus(b.timeDropdown, b.timeDropdown) + isError = true + } + + if (share && team == null) { b.teamDropdown.error = app.getString(R.string.dialog_event_manual_team_choose) + if (!isError) b.teamDropdown.parent.requestChildFocus(b.teamDropdown, b.teamDropdown) isError = true } if (type == null) { b.typeDropdown.error = app.getString(R.string.dialog_event_manual_type_choose) + if (!isError) b.typeDropdown.requestFocus() isError = true } if (topic.isNullOrBlank()) { b.topic.error = app.getString(R.string.dialog_event_manual_topic_choose) + if (!isError) b.topic.requestFocus() isError = true } + val startTime = if (timeSelected == 0L) + null + else + (timeSelected as? Pair<*, *>)?.first as? Time + if (isError) return + date ?: return + topic ?: return val id = System.currentTimeMillis() val eventObject = Event( - profileId, - editingEvent?.id ?: id, - date, - lesson?.displayStartTime, - topic, - customColor ?: -1, - type?.toInt() ?: Event.TYPE_DEFAULT, - true, - teacherId ?: -1, - subjectId ?: -1, - teamId ?: -1 - ) + profileId = profileId, + id = editingEvent?.id ?: id, + date = date, + time = startTime, + topic = topic, + color = customColor, + type = type?.id ?: Event.TYPE_DEFAULT, + teacherId = teacher?.id ?: -1, + subjectId = subject?.id ?: -1, + teamId = team?.id ?: -1, + addedDate = editingEvent?.addedDate ?: System.currentTimeMillis() + ).also { + it.addedManually = true + } val metadataObject = Metadata( profileId, - when (type?.toInt()) { + when (type?.id) { Event.TYPE_HOMEWORK -> Metadata.TYPE_HOMEWORK else -> Metadata.TYPE_EVENT }, eventObject.id, true, - true, - editingEvent?.addedDate ?: System.currentTimeMillis() + true ) launch { - val profile = app.db.profileDao().getFullByIdNow(profileId) + val profile = app.db.profileDao().getByIdNow(profileId) if (!share && !editingShared) { - Toast.makeText(activity, "Save without sharing", Toast.LENGTH_SHORT).show() + //Toast.makeText(activity, R.string.event_manual_saving, Toast.LENGTH_SHORT).show() finishAdding(eventObject, metadataObject) } else if (editingShared && !editingOwn) { - Toast.makeText(activity, "Request editing somebody's event", Toast.LENGTH_SHORT).show() + Toast.makeText(activity, "Opcja edycji wydarzeń innych uczniów nie została jeszcze zaimplementowana.", Toast.LENGTH_LONG).show() // TODO } else if (!share && editingShared) { - Toast.makeText(activity, "Unshare own event", Toast.LENGTH_SHORT).show() - - SzkolnyTask.unshareEvent(eventObject.withMetadata(metadataObject)).enqueue(activity) - finishAdding(eventObject, metadataObject) - } - else if (share) { - Toast.makeText(activity, "Share/update own event", Toast.LENGTH_SHORT).show() + showSharingProgressDialog() eventObject.apply { - sharedBy = profile?.usernameId + sharedBy = null sharedByName = profile?.studentNameLong } - metadataObject.addedDate = System.currentTimeMillis() + api.runCatching(activity) { + unshareEvent(eventObject) + } ?: run { + progressDialog?.dismiss() + return@launch + } - SzkolnyTask.shareEvent(eventObject.withMetadata(metadataObject)).enqueue(activity) + eventObject.sharedByName = null + finishAdding(eventObject, metadataObject) + } + else if (share) { + showSharingProgressDialog() + + eventObject.apply { + sharedBy = profile?.userCode + sharedByName = profile?.studentNameLong + addedDate = System.currentTimeMillis() + } + + api.runCatching(activity) { + shareEvent(eventObject.withMetadata(metadataObject)) + } ?: run { + progressDialog?.dismiss() + return@launch + } eventObject.sharedBy = "self" finishAdding(eventObject, metadataObject) @@ -649,40 +536,56 @@ class EventManualDialog( else { Toast.makeText(activity, "Unknown action :(", Toast.LENGTH_SHORT).show() } + progressDialog?.dismiss() } } private fun removeEvent() { - if (editingShared && editingOwn) { - Toast.makeText(activity, "Unshare + remove own event", Toast.LENGTH_SHORT).show() + launch { + if (editingShared && editingOwn) { + // unshare + remove own event + showRemovingProgressDialog() - editingEvent?.let { SzkolnyTask.unshareEvent(it).enqueue(activity) } - finishRemoving() - } - else if (editingShared && !editingOwn) { - Toast.makeText(activity, "Remove + blacklist somebody's event", Toast.LENGTH_SHORT).show() - // TODO - } - else { - Toast.makeText(activity, "Remove event", Toast.LENGTH_SHORT).show() - finishRemoving() + api.runCatching(activity) { + unshareEvent(editingEvent!!) + } ?: run { + progressDialog?.dismiss() + return@launch + } + + finishRemoving() + } else if (editingShared && !editingOwn) { + // remove + blacklist somebody's event + Toast.makeText(activity, "Nie zaimplementowana opcja :(", Toast.LENGTH_SHORT).show() + // TODO + } else { + // remove event + //Toast.makeText(activity, R.string.event_manual_remove, Toast.LENGTH_SHORT).show() + finishRemoving() + } + progressDialog?.dismiss() } } private fun finishAdding(eventObject: Event, metadataObject: Metadata) { launch { withContext(Dispatchers.Default) { - app.db.eventDao().add(eventObject) + app.db.eventDao().upsert(eventObject) app.db.metadataDao().add(metadataObject) } } + onSaveListener?.invoke(eventObject.withMetadata(metadataObject).also { + it.subjectLongName = (b.subjectDropdown.getSelected() as? Subject)?.longName + it.teacherName = b.teacherDropdown.getSelected()?.fullName + it.teamName = b.teamDropdown.getSelected()?.name + it.typeName = b.typeDropdown.getSelected()?.name + }) dialog.dismiss() Toast.makeText(activity, R.string.saved, Toast.LENGTH_SHORT).show() - if (activity is MainActivity) - activity.reloadTarget() } private fun finishRemoving() { + editingEvent ?: return launch { withContext(Dispatchers.Default) { app.db.eventDao().remove(editingEvent) @@ -690,9 +593,8 @@ class EventManualDialog( } removeEventDialog?.dismiss() + onSaveListener?.invoke(null) dialog.dismiss() Toast.makeText(activity, R.string.removed, Toast.LENGTH_SHORT).show() - if (activity is MainActivity) - activity.reloadTarget() } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialogOld.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialogOld.java deleted file mode 100644 index d704a81a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/event/EventManualDialogOld.java +++ /dev/null @@ -1,885 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.dialogs.event; - - -import android.app.Activity; -import android.content.Context; -import android.content.DialogInterface; -import android.os.AsyncTask; -import android.view.View; -import android.widget.Button; -import android.widget.TextView; -import android.widget.Toast; - -import androidx.annotation.ColorInt; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.PopupMenu; -import androidx.appcompat.widget.SwitchCompat; -import androidx.lifecycle.Observer; - -import com.afollestad.materialdialogs.DialogAction; -import com.afollestad.materialdialogs.MaterialDialog; -import com.google.android.material.textfield.TextInputEditText; -import com.google.android.material.textfield.TextInputLayout; -import com.google.gson.JsonObject; -import com.jaredrummler.android.colorpicker.ColorPickerDialog; -import com.jaredrummler.android.colorpicker.ColorPickerDialogListener; -import com.mikepenz.iconics.IconicsColor; -import com.mikepenz.iconics.IconicsDrawable; -import com.mikepenz.iconics.IconicsSize; -import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial; -import com.wdullaer.materialdatetimepicker.date.DatePickerDialog; -import com.wdullaer.materialdatetimepicker.time.TimePickerDialog; - -import java.util.List; - -import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.MainActivity; -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.data.db.modules.events.Event; -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull; -import pl.szczodrzynski.edziennik.data.db.modules.events.EventType; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull; -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata; -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile; -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull; -import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject; -import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher; -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team; -import pl.szczodrzynski.edziennik.network.ServerRequest; -import pl.szczodrzynski.edziennik.utils.TextInputDropDown; -import pl.szczodrzynski.edziennik.utils.Themes; -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.utils.models.Time; -import pl.szczodrzynski.edziennik.utils.models.Week; - -import static pl.szczodrzynski.edziennik.App.APP_URL; -import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.COLOR_DEFAULT; -import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK; -import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_UNDEFINED; -import static pl.szczodrzynski.edziennik.utils.Utils.bs; -import static pl.szczodrzynski.edziennik.utils.Utils.ns; - -public class EventManualDialogOld { - private static final String TAG = "EventManualDialogOld"; - private App app; - private Context context; - private int profileId; - private ProfileFull profile = null; - - public EventManualDialogOld(Context context, int profileId) { - this.context = context; - this.activity = (AppCompatActivity) context; - this.profileId = profileId; - } - public EventManualDialogOld(Context context) { - this.context = context; - this.activity = (AppCompatActivity) context; - this.profileId = App.profileId; - } - - - private AppCompatActivity activity; - private MaterialDialog dialog; - private View dialogView; - private TextInputLayout registerEventManualDateLayout; - private TextInputDropDown registerEventManualDate; - private TextInputLayout registerEventManualLessonLayout; - private TextInputDropDown registerEventManualLesson; - private TextInputLayout registerEventManualTeamLayout; - private TextInputDropDown registerEventManualTeam; - private SwitchCompat registerEventManualShare; - private TextView registerEventManualShareText; - private TextInputLayout registerEventManualTypeLayout; - private TextInputDropDown registerEventManualType; - private TextInputLayout registerEventManualTopicLayout; - private TextInputEditText registerEventManualTopic; - private TextInputDropDown registerEventManualTeacher; - private TextInputDropDown registerEventManualSubject; - private View registerEventManualColorPreview; - private Button registerEventManualColorChoose; - private Date lessonDate = Date.getToday(); - private Time lessonStartTime = null; - private long lessonTeamId = -1; - private long lessonTeacherId = -1; - private long lessonSubjectId = -1; - private boolean lessonSelected = false; - private int eventType = TYPE_UNDEFINED; - private int eventColor = -1; - private EventFull editingEvent = null; - private MaterialDialog progressDialog; - - private void updateButtonCaption() - { - String buttonCaption = ""; - buttonCaption += Week.getFullDayName(Week.getWeekDayFromDate(lessonDate)); - buttonCaption += ", "; - buttonCaption += lessonDate.getFormattedString(); - registerEventManualDate.setText(buttonCaption); - - registerEventManualLesson.setText(R.string.dialog_event_manual_choose_lesson); - lessonStartTime = null; - - //lessonSubjectId = -1; - //lessonTeacherId = -1; - } - - private void updateSubjectTeacher() { - AsyncTask.execute(() -> { - Subject subject = app.db.subjectDao().getByIdNow(profileId, lessonSubjectId); - Teacher teacher = app.db.teacherDao().getByIdNow(profileId, lessonTeacherId); - - activity.runOnUiThread(() -> { - if (lessonTeacherId == -1 || teacher == null) - registerEventManualTeacher.setText(R.string.dialog_event_manual_no_teacher); - else - registerEventManualTeacher.setText(teacher.getFullName()); - - if (lessonSubjectId == -1 || subject == null) - registerEventManualSubject.setText(R.string.dialog_event_manual_no_subject); - else - registerEventManualSubject.setText(subject.longName); - }); - }); - - } - - private void addEvent() - { - registerEventManualDateLayout.setError(null); - registerEventManualLessonLayout.setError(null); - registerEventManualTeamLayout.setError(null); - registerEventManualTopicLayout.setError(null); - registerEventManualTypeLayout.setError(null); - boolean errors = false; - if (!lessonSelected) { - registerEventManualLessonLayout.setError(app.getString(R.string.dialog_event_manual_lesson_choose)); - errors = true; - } - if (registerEventManualShare.isChecked() && lessonTeamId == -1) { - registerEventManualTeamLayout.setError(app.getString(R.string.dialog_event_manual_team_choose)); - errors = true; - } - if (eventType == -2) { - registerEventManualTypeLayout.setError(app.getString(R.string.dialog_event_manual_type_choose)); - errors = true; - } - if (registerEventManualTopic.getText() == null || registerEventManualTopic.getText().toString().isEmpty()) { - registerEventManualTopicLayout.setError(app.getString(R.string.dialog_event_manual_topic_choose)); - errors = true; - } - if (errors) - return; - - long id = System.currentTimeMillis(); - Event event = new Event( - profileId, - id, - lessonDate, - lessonStartTime, - registerEventManualTopic.getText().toString(), - eventColor, - eventType, - true, - lessonTeacherId, - lessonSubjectId, - lessonTeamId - ); - Metadata metadata = new Metadata( - profileId, - eventType == TYPE_HOMEWORK ? Metadata.TYPE_HOMEWORK : Metadata.TYPE_EVENT, - event.id, - true, - true, - System.currentTimeMillis() - ); - if (editingEvent != null) { - event.id = editingEvent.id; - metadata.thingId = event.id; - metadata.addedDate = editingEvent.addedDate; - } - if (registerEventManualShare.isChecked()) { - if (profile.getRegistration() != Profile.REGISTRATION_ENABLED) { - new MaterialDialog.Builder(context) - .title(R.string.dialog_event_manual_must_register_title) - .content(R.string.dialog_event_manual_must_register_text) - .positiveText(R.string.i_agree) - .negativeText(R.string.no_thanks) - .neutralText(R.string.more) - .onPositive(((dialog1, which) -> { - profile.setRegistration(Profile.REGISTRATION_ENABLED); - app.profileSaveAsync(profile); - })) - .onNeutral(((dialog1, which) -> { - new MaterialDialog.Builder(context) - .title(R.string.help) - .content(app.getString(R.string.help_register_agreement)) - .positiveText(R.string.ok) - .show(); - })) - .show(); - return; - } - if (!profile.getEnableSharedEvents()) { - new MaterialDialog.Builder(context) - .title(R.string.dialog_event_manual_shared_disabled_title) - .content(R.string.dialog_event_manual_shared_disabled_text) - .positiveText(R.string.sure) - .negativeText(R.string.no_thanks) - .onPositive(((dialog1, which) -> { - profile.setEnableSharedEvents(true); - app.profileSaveAsync(profile); - })) - .show(); - return; - } - if (editingEvent != null - && editingEvent.sharedBy != null - && !editingEvent.sharedBy.equals("self")) { - // editing a shared event, and event was shared by someone else - // send a edit request - shareEvent(event, metadata, MODE_REQUEST); - } - else { - // editing a self-shared event, not-shared event or a new event, but want to share it - // post a new event to database - shareEvent(event, metadata, MODE_SHARE); - } - } - else if (editingEvent != null - && editingEvent.sharedBy != null - && editingEvent.sharedBy.equals("self")) { - // the event was self-shared, but needs to be removed now (from the server) - shareEvent(event, metadata, MODE_UNSHARE); - } - else { - // editing a local event - finishAdding(event, metadata); - } - } - - private static final int MODE_SHARE = 0; - private static final int MODE_UNSHARE = 1; - private static final int MODE_REQUEST = 2; - private static final int MODE_UNSHARE_REMOVE = 3; - private void shareEvent(Event event, Metadata metadata, int mode) { - AsyncTask.execute(() -> { - ServerRequest syncRequest = - new ServerRequest( - app, - app.requestScheme + APP_URL + "main.php?share", - "RegisterEventManualDialog/SH", - profile); - String teamUnshare = ""; - if (mode == MODE_SHARE) { - if (editingEvent != null - && event.teamId != editingEvent.teamId) { - // team ID was changed. Need to remove the event for other teams - teamUnshare = app.db.teamDao().getCodeByIdNow(profile.getId(), editingEvent.teamId); - syncRequest.setBodyParameter("team_unshare", teamUnshare); - } - syncRequest.setBodyParameter("event", app.gson.toJson(event)); - syncRequest.setBodyParameter("event_addedDate", Long.toString(metadata.addedDate)); - syncRequest.setBodyParameter("team", app.db.teamDao().getCodeByIdNow(profile.getId(), event.teamId)); - } - else if (mode == MODE_UNSHARE - && editingEvent != null) { - teamUnshare = app.db.teamDao().getCodeByIdNow(profile.getId(), editingEvent.teamId); - syncRequest.setBodyParameter("remove_id", Long.toString(editingEvent.id)); - syncRequest.setBodyParameter("team_unshare", teamUnshare); - } - else if (mode == MODE_UNSHARE_REMOVE - && editingEvent != null) { - teamUnshare = app.db.teamDao().getCodeByIdNow(profile.getId(), editingEvent.teamId); - syncRequest.setBodyParameter("remove_id", Long.toString(editingEvent.id)); - syncRequest.setBodyParameter("team_unshare", teamUnshare); - } - else if (mode == MODE_REQUEST) { - activity.runOnUiThread(() -> { - new MaterialDialog.Builder(context) - .title(R.string.error_occured) - .content(R.string.error_shared_edit_requests_not_implemented) - .positiveText(R.string.ok) - .show(); - }); - return; - } - - - activity.runOnUiThread(() -> { - progressDialog = new MaterialDialog.Builder(context) - .title(R.string.loading) - .content(R.string.sharing_event) - .progress(true, 0) - .canceledOnTouchOutside(false) - .show(); - }); - String finalTeamUnshare = teamUnshare; - - try { - JsonObject result = syncRequest.runSync(); - - activity.runOnUiThread(() -> progressDialog.dismiss()); - if (result == null) { - activity.runOnUiThread(() -> new MaterialDialog.Builder(context) - .title(R.string.error_occured) - .content(R.string.sync_error_no_internet) - .positiveText(R.string.ok) - .show()); - - return; - } - if (result.get("success") == null || !result.get("success").getAsString().equals("true")) { - activity.runOnUiThread(() -> new MaterialDialog.Builder(context) - .title(R.string.error_occured) - .content(R.string.sync_error_app_server) - .positiveText(R.string.ok) - .show()); - return; - } - if (mode == MODE_SHARE) { - event.sharedBy = "self"; - event.sharedByName = profile.getStudentNameLong(); - } - else if (mode == MODE_UNSHARE) { - event.sharedBy = null; - } - // check all profiles - // remove if necessary (team matching) - // this will hardly ever need to run - // (only if the user un-shares an event and has two profiles sharing the same team in common) - if (finalTeamUnshare != null && !finalTeamUnshare.equals("")) { - app.db.eventDao().removeByTeamId(editingEvent.teamId, editingEvent.id); - } - - if (mode == MODE_UNSHARE_REMOVE - && editingEvent != null) { - editingEvent.sharedBy = null; - AsyncTask.execute(() -> { - app.db.eventDao().remove(editingEvent); - }); - activity.runOnUiThread(() -> { - Toast.makeText(app, R.string.removed, Toast.LENGTH_SHORT).show(); - if (activity instanceof MainActivity) - ((MainActivity) activity).reloadTarget(); - dialog.dismiss(); - }); - } - else { - activity.runOnUiThread(() -> { - finishAdding(event, metadata); - }); - } - } catch (Exception e) { - activity.runOnUiThread(() -> { - // TODO show error in EventManualDialogOld - //app.apiEdziennik.guiShowErrorDialog(activity, new AppError(TAG, 379, CODE_OTHER, null, e), R.string.error_occured); - }); - } - }); - } - - private void finishAdding(Event event, Metadata metadata) { - AsyncTask.execute(() -> { - app.db.eventDao().add(event); - app.db.metadataDao().add(metadata); - if (editingEvent != null && (event.type == TYPE_HOMEWORK) != (editingEvent.type == TYPE_HOMEWORK)) { - // editingEvent's type changed - // the old metadata will not work because either the event changed *to* or *from* homework. - app.db.metadataDao().delete( - profileId, - editingEvent.type == TYPE_HOMEWORK ? Metadata.TYPE_HOMEWORK : Metadata.TYPE_EVENT, - editingEvent.id - ); - } - }); - Toast.makeText(app, R.string.saved, Toast.LENGTH_SHORT).show(); - dialog.dismiss(); - if (activity instanceof MainActivity) - ((MainActivity) activity).reloadTarget(); - } - - private DialogInterface.OnDismissListener dismissListener; - private boolean callDismissListener = true; - - public EventManualDialogOld withDismissListener(DialogInterface.OnDismissListener dismissListener) { - this.dismissListener = dismissListener; - return this; - } - - private void performDismiss(DialogInterface dialogInterface) { - if (!dialog.isCancelled()) - dialog.dismiss(); - if (callDismissListener && dismissListener != null) { - dismissListener.onDismiss(dialogInterface); - } - callDismissListener = true; - } - - public static final int DIALOG_EVENT = 0; - public static final int DIALOG_HOMEWORK = 1; - - public void show(App _app, EventFull editingEvent, Date defaultDate, Time defaultTime, int dialogType) { - if (!(context instanceof Activity)) - return; - this.app = _app; - AsyncTask.execute(() -> { - this.profile = app.db.profileDao().getFullByIdNow(profileId); - if (profile != null) { - ((Activity) context).runOnUiThread(() -> { - actualShow(editingEvent, defaultDate, defaultTime, dialogType); - }); - } - else { - activity.runOnUiThread(() -> { - new MaterialDialog.Builder(activity) - .title(R.string.error_occured) - .content(R.string.sync_error_profile_not_found) - .positiveText(R.string.ok) - .show(); - }); - } - }); - } - private void actualShow(EventFull editingEvent, Date defaultDate, Time defaultTime, int dialogType) { - if (dialogType == DIALOG_HOMEWORK) { - eventType = TYPE_HOMEWORK; - eventColor = -1; - } - dialog = new MaterialDialog.Builder(context) - .title((dialogType == DIALOG_EVENT ? R.string.dialog_register_event_manual_title : R.string.dialog_register_homework_manual_title)) - .customView(R.layout.dialog_event_manual, true) - .positiveText(R.string.save) - .negativeText(R.string.cancel) - .autoDismiss(false) - .onPositive((dialog, which) -> addEvent()) - .onNegative((dialog, which) -> dialog.dismiss()) - .onNeutral((dialog, which) -> { - if (editingEvent != null) { - String sharedNotice = ""; - // notify the user that the event will be removed from all users - if (editingEvent.sharedBy != null - && editingEvent.sharedBy.equals("self")) { - sharedNotice += "\n\n"+context.getString(R.string.dialog_event_manual_remove_shared_self); - } - // notify the user that the event will be blacklisted and removed only locally - else if (editingEvent.sharedBy != null) { - sharedNotice += "\n\n"+context.getString(R.string.dialog_event_manual_remove_shared); - } - new MaterialDialog.Builder(context) - .title(R.string.are_you_sure) - .content(context.getString(R.string.dialog_register_event_manual_remove_confirmation)+sharedNotice) - .positiveText(R.string.yes) - .negativeText(R.string.no) - .onPositive((dialog1, which1) -> { - if (editingEvent.sharedBy != null - && editingEvent.sharedBy.equals("self")) { - // editing event was self-shared - // the shared event needs to be unshared, then removed locally - shareEvent(editingEvent, null, MODE_UNSHARE_REMOVE); - return; - } - else if (editingEvent.sharedBy != null) { - // the event is shared by someone else - // blacklist it and remove only locally - AsyncTask.execute(() -> { - editingEvent.blacklisted = true; - app.db.eventDao().setBlacklisted(editingEvent.profileId, editingEvent.id, true); - }); - } - else { - // the event is not shared nor blacklisted - just remove it - AsyncTask.execute(() -> { - app.db.eventDao().remove(editingEvent); - }); - } - dialog.dismiss(); - dialog1.dismiss(); - Toast.makeText(app, R.string.removed, Toast.LENGTH_SHORT).show(); - if (activity instanceof MainActivity) - ((MainActivity) activity).reloadTarget(); - }) - .show(); - } - }) - .dismissListener((this::performDismiss)) - .show(); - - if (editingEvent != null) { - //&& (editingEvent.sharedBy == null || editingEvent.sharedBy.equals("self"))) { - dialog.setActionButton(DialogAction.NEUTRAL, R.string.remove); - } - - dialogView = dialog.getCustomView(); - assert dialogView != null; - - @ColorInt int primaryTextColor = Themes.INSTANCE.getPrimaryTextColor(context); - - registerEventManualDateLayout = dialogView.findViewById(R.id.registerEventManualDateLayout); - registerEventManualDate = dialogView.findViewById(R.id.registerEventManualDate); - registerEventManualDate.setCompoundDrawablesWithIntrinsicBounds(null, null, new IconicsDrawable(context, CommunityMaterial.Icon.cmd_calendar_outline).size(IconicsSize.dp(16)).color(IconicsColor.colorInt(primaryTextColor)), null); - //registerEventManualDate.setCompoundDrawablePadding(Utils.dpToPx(6)); - registerEventManualLessonLayout = dialogView.findViewById(R.id.registerEventManualLessonLayout); - registerEventManualLesson = dialogView.findViewById(R.id.registerEventManualLesson); - registerEventManualTeamLayout = dialogView.findViewById(R.id.registerEventManualTeamLayout); - registerEventManualTeam = dialogView.findViewById(R.id.registerEventManualTeam); - registerEventManualTeacher = dialogView.findViewById(R.id.registerEventManualTeacher); - registerEventManualSubject = dialogView.findViewById(R.id.registerEventManualSubject); - registerEventManualTypeLayout = dialogView.findViewById(R.id.registerEventManualTypeLayout); - registerEventManualType = dialogView.findViewById(R.id.registerEventManualType); - registerEventManualTopicLayout = dialogView.findViewById(R.id.registerEventManualTopicLayout); - registerEventManualTopic = dialogView.findViewById(R.id.registerEventManualTopic); - registerEventManualShare = dialogView.findViewById(R.id.registerEventManualShare); - registerEventManualShareText = dialogView.findViewById(R.id.registerEventManualShareText); - registerEventManualShare.setOnCheckedChangeListener(((buttonView, isChecked) -> { - // show notice text if share is enabled or event is already shared - registerEventManualShareText.setVisibility(isChecked || (editingEvent != null && editingEvent.sharedBy != null) ? View.VISIBLE : View.GONE); - // notify the user if he wants to share the event with no team selected - if (isChecked && lessonTeamId == -1) { - Toast.makeText(context, R.string.dialog_event_manual_cannot_share, Toast.LENGTH_SHORT).show(); - } - if (editingEvent != null && editingEvent.sharedBy != null) { - // if the event is already shared, show the (change) or (removal) notice text - if (isChecked) - registerEventManualShareText.setText(R.string.dialog_event_manual_share_will_change); - else - registerEventManualShareText.setText(R.string.dialog_event_manual_share_will_remove); - } - })); - - - registerEventManualDate.setOnClickListener(v -> DatePickerDialog.newInstance( - (view, year, monthOfYear, dayOfMonth) -> { - lessonDate.year = year; - lessonDate.month = monthOfYear + 1; - lessonDate.day = dayOfMonth; - updateButtonCaption(); - }, - lessonDate.year, - lessonDate.month - 1, - lessonDate.day - ).show(((AppCompatActivity) context).getSupportFragmentManager(), "DatePickerDialog")); - - registerEventManualLesson.setOnClickListener(v -> { - app.db.lessonDao().getAllByDateWithoutChanges(profileId, lessonDate).observe(activity, new Observer>() { - @Override - public void onChanged(@Nullable List lessons) { - PopupMenu popup = new PopupMenu(context, registerEventManualLesson); - - if (lessons != null && lessons.size() != 0) { - for (LessonFull lesson: lessons) { - int index = lessons.indexOf(lesson); - popup.getMenu().add( - 0, - index, - index+1, - lesson.startTime.getStringHM()+" "+bs(lesson.subjectLongName)); - } - } - popup.getMenu().add(1, -1, 0, R.string.dialog_event_manual_all_day); - popup.getMenu().add(1, 0, 100, R.string.dialog_event_manual_custom_time); - - popup.setOnMenuItemClickListener(item -> { - if (lessons != null && item.getGroupId() == 0) { - LessonFull lesson = lessons.get(item.getItemId()); - lessonTeacherId = lesson.teacherId; - lessonStartTime = lesson.startTime; - lessonSubjectId = lesson.subjectId; - registerEventManualTeacher.setText(bs(lesson.teacherFullName)); - registerEventManualSubject.setText(bs(lesson.subjectLongName)); - lessonTeamId = lesson.teamId; - registerEventManualTeam.setText(ns(context.getString(R.string.dialog_event_manual_no_team), bs(lesson.teamName))); - registerEventManualLesson.setText(item.getTitle()); - lessonSelected = true; - } - else if (item.getGroupId() == 1) { - if (item.getItemId() == -1) { - lessonStartTime = null; - lessonTeacherId = -1; - lessonSubjectId = -1; - if (editingEvent != null) { - lessonTeacherId = editingEvent.teacherId; - lessonSubjectId = editingEvent.subjectId; - } - updateSubjectTeacher(); - registerEventManualLesson.setText(item.getTitle()); - lessonSelected = true; - return true; - } - Time now = Time.getNow(); - TimePickerDialog.newInstance((view, hourOfDay, minute, second) -> { - lessonStartTime = new Time(hourOfDay, minute, second); - lessonTeacherId = -1; - lessonSubjectId = -1; - if (editingEvent != null) { - lessonTeacherId = editingEvent.teacherId; - lessonSubjectId = editingEvent.subjectId; - } - updateSubjectTeacher(); - //lessonTeamId = -1; - registerEventManualLesson.setText(lessonStartTime.getStringHM()); - lessonSelected = true; - }, now.hour, now.minute, 0, true).show(((AppCompatActivity) context).getSupportFragmentManager(), "TimePickerDialog"); - } - return true; - }); - - popup.show(); - app.db.lessonDao().getAllByDateWithoutChanges(profileId, lessonDate).removeObserver(this); - } - }); - }); - - registerEventManualTeam.setOnClickListener(v -> { - app.db.teamDao().getAll(profileId).observe(activity, new Observer>() { - @Override - public void onChanged(@Nullable List teams) { - PopupMenu popup = new PopupMenu(context, registerEventManualTeam); - if (teams != null && teams.size() != 0) { - int index = 0; - for (Team team : teams) { - popup.getMenu().add(0, index++, (index)+1, team.name); - } - } - popup.getMenu().add(1, 0, 100, context.getString(R.string.dialog_event_manual_no_team)); - popup.setOnMenuItemClickListener(item -> { - long id = -1; - if (item.getGroupId() == 0 && teams != null) { - Team team = teams.get(item.getItemId()); - id = team.id; - } - lessonTeamId = id; - registerEventManualTeam.setText(item.getTitle()); - return true; - }); - popup.show(); - app.db.teamDao().getAll(profileId).removeObserver(this); - } - }); - }); - - registerEventManualTeacher.setOnClickListener(v -> { - app.db.teacherDao().getAllTeachers(profileId).observe(activity, new Observer>() { - @Override - public void onChanged(@Nullable List teachers) { - PopupMenu popup = new PopupMenu(context, registerEventManualTeacher); - if (teachers != null && teachers.size() != 0) { - int index = 0; - for (Teacher teacher : teachers) { - popup.getMenu().add(0, index++, (index)+1, teacher.getFullName()); - } - } - popup.getMenu().add(1, 0, 0, context.getString(R.string.dialog_event_manual_no_teacher)); - popup.setOnMenuItemClickListener(item -> { - long id = -1; - if (item.getGroupId() == 0 && teachers != null) { - Teacher teacher = teachers.get(item.getItemId()); - id = teacher.id; - } - lessonTeacherId = id; - registerEventManualTeacher.setText(item.getTitle()); - return true; - }); - popup.show(); - app.db.teacherDao().getAllTeachers(profileId).removeObserver(this); - } - }); - }); - registerEventManualSubject.setOnClickListener(v -> { - app.db.subjectDao().getAll(profileId).observe(activity, new Observer>() { - @Override - public void onChanged(@Nullable List subjects) { - PopupMenu popup = new PopupMenu(context, registerEventManualSubject); - if (subjects != null && subjects.size() != 0) { - int index = 0; - for (Subject subject: subjects) { - popup.getMenu().add(0, index++, (index)+1, subject.longName); - } - } - popup.getMenu().add(1, 0, 0, context.getString(R.string.dialog_event_manual_no_subject)); - popup.setOnMenuItemClickListener(item -> { - long id = -1; - if (item.getGroupId() == 0 && subjects != null) { - Subject subject = subjects.get(item.getItemId()); - id = subject.id; - } - lessonSubjectId = id; - registerEventManualSubject.setText(item.getTitle()); - return true; - }); - popup.show(); - app.db.subjectDao().getAll(profileId).removeObserver(this); - } - }); - }); - registerEventManualType.setOnClickListener(v -> { - app.db.eventTypeDao().getAll(profileId).observe(activity, new Observer>() { - @Override - public void onChanged(@Nullable List eventTypes) { - PopupMenu popup = new PopupMenu(context, registerEventManualType); - if (eventTypes != null && eventTypes.size() != 0) { - int index = 0; - for (EventType eventType : eventTypes) { - popup.getMenu().add(0, index++, (index)+1, eventType.name); - } - } - popup.setOnMenuItemClickListener(item -> { - if (item.getGroupId() == 0 && eventTypes != null) { - EventType typeObj = eventTypes.get(item.getItemId()); - eventType = (int)typeObj.id; - eventColor = -1; // set -1 as it's the event type's default color - registerEventManualColorPreview.setBackgroundColor(typeObj.color); // set event type's color here to show how will it look - } - registerEventManualType.setText(item.getTitle()); - return true; - }); - popup.show(); - app.db.eventTypeDao().getAll(profileId).removeObserver(this); - } - }); - }); - - View.OnClickListener colorChooseOnClick = (v -> { - AsyncTask.execute(() -> { - EventType type = app.db.eventTypeDao().getByIdNow(profileId, eventType); - activity.runOnUiThread(() -> { - ColorPickerDialog colorPickerDialog = ColorPickerDialog.newBuilder() - .setColor(eventColor != -1 ? eventColor : type != null ? type.color : COLOR_DEFAULT) - .create(); - colorPickerDialog.setColorPickerDialogListener( - new ColorPickerDialogListener() { - @Override - public void onColorSelected(int dialogId, int color) { - registerEventManualColorPreview.setBackgroundColor(color); - eventColor = color; - } - - @Override - public void onDialogDismissed(int dialogId) { - - } - }); - colorPickerDialog.show(((Activity)context).getFragmentManager(), "color-picker-dialog"); - }); - }); - }); - - registerEventManualColorPreview = dialogView.findViewById(R.id.registerEventManualColorPreview); - registerEventManualColorPreview.setOnClickListener(colorChooseOnClick); - registerEventManualColorChoose = dialogView.findViewById(R.id.registerEventManualColorChoose); - registerEventManualColorChoose.setOnClickListener(colorChooseOnClick); - - if (eventType != TYPE_UNDEFINED) { - AsyncTask.execute(() -> { - EventType type = app.db.eventTypeDao().getByIdNow(profileId, eventType); - activity.runOnUiThread(() -> { - if (type != null) { - eventColor = -1; - registerEventManualColorPreview.setBackgroundColor(type.color); - registerEventManualType.setText(type.name); - } - else { - eventColor = -1; - eventType = TYPE_UNDEFINED; - registerEventManualColorPreview.setBackgroundColor(COLOR_DEFAULT); - registerEventManualType.setText(""); - } - }); - }); - } - else { - registerEventManualColorPreview.setBackgroundColor(COLOR_DEFAULT); - eventColor = -1; - } - - /*if (dialogType == DIALOG_HOMEWORK) { - dialogView.findViewById(R.id.registerEventManualColorContainer).setVisibility(View.GONE); - registerEventManualType.setVisibility(View.GONE); - eventType = TYPE_HOMEWORK; - } - else { - - - }*/ - - updateButtonCaption(); - - if (editingEvent != null) { - this.editingEvent = editingEvent; - lessonDate = editingEvent.eventDate.clone(); - lessonTeamId = editingEvent.teamId; - // check the (shared) checkbox if the event is already shared by someone - registerEventManualShare.setChecked(editingEvent.sharedBy != null); - // .. but disable the ability to un-share, if it's shared by someone else - registerEventManualShare.setEnabled(editingEvent.sharedBy == null || editingEvent.sharedBy.equals("self")); - registerEventManualShare.jumpDrawablesToCurrentState(); - // show the notice text if the event is already shared - registerEventManualShareText.setVisibility(editingEvent.sharedBy != null ? View.VISIBLE : View.GONE); - if (editingEvent.sharedBy != null) { - // show the (change) notice if the event is shared by (self) - if (editingEvent.sharedBy.equals("self")) - registerEventManualShareText.setText(R.string.dialog_event_manual_share_will_change); - // otherwise show the (edit request) notice - else - registerEventManualShareText.setText(app.getString(R.string.dialog_event_manual_share_will_request, editingEvent.sharedByName)); - } - - updateButtonCaption(); // updates the lesson date and clears the time - - lessonSubjectId = editingEvent.subjectId; - lessonTeacherId = editingEvent.teacherId; - lessonStartTime = editingEvent.startTime == null ? null : editingEvent.startTime.clone(); - lessonSelected = true; - - registerEventManualTeam.setText(ns(context.getString(R.string.dialog_event_manual_no_team), editingEvent.teamName)); - registerEventManualTopic.setText(editingEvent.topic); - registerEventManualType.setText(editingEvent.typeName); - eventColor = editingEvent.getColor(); - eventType = editingEvent.type; - registerEventManualColorPreview.setBackgroundColor(eventColor); - - if (lessonSubjectId == -1) { - //lessonTeacherId = -1; // why tho? - registerEventManualLesson.setText(lessonStartTime == null ? app.getString(R.string.dialog_event_manual_all_day) : lessonStartTime.getStringHM()); - } - else { - registerEventManualLesson.setText((lessonStartTime == null ? app.getString(R.string.dialog_event_manual_all_day) + "," : lessonStartTime.getStringHM())+" "+bs(editingEvent.subjectLongName)); - } - } - else { - if (defaultDate != null) { - lessonDate = defaultDate.clone(); - updateButtonCaption(); - } - if (defaultDate != null && defaultTime != null) { // ONLY used when adding an event to the previously selected lesson - AsyncTask.execute(() -> { - LessonFull lesson = app.db.lessonDao().getByDateTimeWithoutChangesNow(profileId, defaultDate, defaultTime); - - lessonTeacherId = lesson.teacherId; - lessonStartTime = lesson.startTime.clone(); - lessonTeamId = lesson.teamId; - lessonSubjectId = lesson.subjectId; - lessonSelected = true; - activity.runOnUiThread(() -> { - registerEventManualTeam.setText(ns(context.getString(R.string.dialog_event_manual_no_team), lesson.teamName)); - registerEventManualLesson.setText(lesson.startTime.getStringHM()+" "+bs(lesson.subjectLongName)); - registerEventManualTeacher.setText(ns(context.getString(R.string.dialog_event_manual_no_teacher), lesson.teacherFullName)); - registerEventManualSubject.setText(ns(context.getString(R.string.dialog_event_manual_no_subject), lesson.subjectLongName)); - }); - }); - } - else { - AsyncTask.execute(() -> { - Team team = app.db.teamDao().getClassNow(profileId); - if (team != null) { - activity.runOnUiThread(() -> { - lessonTeamId = team.id; - registerEventManualTeam.setText(ns(context.getString(R.string.dialog_event_manual_no_team), team.name)); - }); - } - }); - } - } - updateSubjectTeacher(); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java deleted file mode 100644 index cabc3e63..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.java +++ /dev/null @@ -1,129 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.dialogs.grade; - -import android.content.Context; -import android.content.DialogInterface; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffColorFilter; -import android.os.AsyncTask; -import android.view.View; - -import androidx.core.graphics.ColorUtils; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.afollestad.materialdialogs.MaterialDialog; - -import java.text.DecimalFormat; -import java.util.List; - -import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.ui.modules.grades.GradesListAdapter; -import pl.szczodrzynski.edziennik.databinding.DialogGradeDetailsBinding; -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade; -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeFull; -import pl.szczodrzynski.edziennik.utils.Colors; - -import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.COLOR_MODE_DEFAULT; - -public class GradeDetailsDialog { - private App app; - private Context context; - private int profileId; - - public GradeDetailsDialog(Context context) { - this.context = context; - this.profileId = App.profileId; - } - public GradeDetailsDialog(Context context, int profileId) { - this.context = context; - this.profileId = profileId; - } - - public MaterialDialog dialog; - private DialogGradeDetailsBinding b; - private DialogInterface.OnDismissListener dismissListener; - public boolean callDismissListener = true; - - public GradeDetailsDialog withDismissListener(DialogInterface.OnDismissListener dismissListener) { - this.dismissListener = dismissListener; - return this; - } - public void performDismiss(DialogInterface dialogInterface) { - if (callDismissListener && dismissListener != null) { - dismissListener.onDismiss(dialogInterface); - } - callDismissListener = true; - } - - public void show(App _app, GradeFull grade) - { - this.app = _app; - dialog = new MaterialDialog.Builder(context) - .customView(R.layout.dialog_grade_details, true) - .positiveText(R.string.close) - .autoDismiss(false) - .onPositive((dialog, which) -> dialog.dismiss()) - .dismissListener(this::performDismiss) - .show(); - - View root = dialog.getCustomView(); - assert root != null; - - b = DialogGradeDetailsBinding.bind(root); - - b.setGrade(grade); - - int gradeColor; - if (app.profile.getGradeColorMode() == COLOR_MODE_DEFAULT) { - gradeColor = grade.color; - } - else { - gradeColor = Colors.gradeToColor(grade); - } - - DecimalFormat format = new DecimalFormat("#.##"); - if (grade.weight < 0) { - grade.weight *= -1; - } - if (grade.type == Grade.TYPE_DESCRIPTIVE || grade.type == Grade.TYPE_TEXT || grade.type == Grade.TYPE_BEHAVIOUR) { - b.setWeightText(null); - grade.weight = 0; - } - else { - if (grade.type == Grade.TYPE_POINT) { - b.setWeightText(app.getString(R.string.grades_max_points_format, format.format(grade.valueMax))); - } - else if (grade.weight == 0) { - b.setWeightText(app.getString(R.string.grades_weight_not_counted)); - } - else { - b.setWeightText(app.getString(R.string.grades_weight_format, format.format(grade.weight))); - } - } - - b.setCommentVisible(false); - - b.setDevMode(App.devMode); - - b.gradeName.setTextColor(ColorUtils.calculateLuminance(gradeColor) > 0.25 ? 0xff000000 : 0xffffffff); - b.gradeName.getBackground().setColorFilter(new PorterDuffColorFilter(gradeColor, PorterDuff.Mode.MULTIPLY)); - - AsyncTask.execute(() -> { - - List historyList = app.db.gradeDao().getAllWithParentIdNow(profileId, grade.id); - - if (historyList.size() == 0) { - b.setHistoryVisible(false); - return; - } - b.setHistoryVisible(true); - b.gradeHistoryNest.post(() -> { - b.gradeHistoryNest.setNestedScrollingEnabled(false); - b.gradeHistoryList.setHasFixedSize(false); - b.gradeHistoryList.setNestedScrollingEnabled(false); - b.gradeHistoryList.setLayoutManager(new LinearLayoutManager(context)); - b.gradeHistoryList.setAdapter(new GradesListAdapter(context, historyList)); - }); - }); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt new file mode 100644 index 00000000..a42f9e2f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradeDetailsDialog.kt @@ -0,0 +1,100 @@ +package pl.szczodrzynski.edziennik.ui.dialogs.grade + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.core.graphics.ColorUtils +import androidx.core.view.isVisible +import androidx.recyclerview.widget.LinearLayoutManager +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.* +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.full.GradeFull +import pl.szczodrzynski.edziennik.databinding.DialogGradeDetailsBinding +import pl.szczodrzynski.edziennik.onClick +import pl.szczodrzynski.edziennik.setTintColor +import pl.szczodrzynski.edziennik.ui.modules.grades.GradesAdapter +import pl.szczodrzynski.edziennik.utils.BetterLink +import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration +import kotlin.coroutines.CoroutineContext + +class GradeDetailsDialog( + val activity: AppCompatActivity, + val grade: GradeFull, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "GradeDetailsDialog" + } + + private lateinit var app: App + private lateinit var b: DialogGradeDetailsBinding + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local variables go here + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + b = DialogGradeDetailsBinding.inflate(activity.layoutInflater) + dialog = MaterialAlertDialogBuilder(activity) + .setView(b.root) + .setPositiveButton(R.string.close, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + val manager = app.gradesManager + + val gradeColor = manager.getGradeColor(grade) + b.grade = grade + b.weightText = manager.getWeightString(app, grade) + b.commentVisible = false + b.devMode = App.devMode + b.gradeName.setTextColor(if (ColorUtils.calculateLuminance(gradeColor) > 0.3) 0xaa000000.toInt() else 0xccffffff.toInt()) + b.gradeName.background.setTintColor(gradeColor) + + b.gradeValue = if (grade.weight == 0f || grade.value < 0f) -1f else manager.getGradeValue(grade) + + b.customValueDivider.isVisible = manager.plusValue != null || manager.minusValue != null + b.customValueLayout.isVisible = b.customValueDivider.isVisible + b.customValueButton.onClick { + GradesConfigDialog(activity, reloadOnDismiss = true) + } + + grade.teacherName?.let { name -> + BetterLink.attach( + b.teacherName, + teachers = mapOf(grade.teacherId to name), + onActionSelected = dialog::dismiss + ) + } + + launch { + val historyList = withContext(Dispatchers.Default) { + app.db.gradeDao().getByParentIdNow(App.profileId, grade.id) + } + if (historyList.isEmpty()) { + b.historyVisible = false + return@launch + } + b.historyVisible = true + //b.gradeHistoryNest.isNestedScrollingEnabled = false + b.gradeHistoryList.adapter = GradesAdapter(activity, { + GradeDetailsDialog(activity, it) + }).also { it.items = historyList.toMutableList() } + b.gradeHistoryList.apply { + setHasFixedSize(true) + layoutManager = LinearLayoutManager(context) + addItemDecoration(SimpleDividerItemDecoration(context)) + } + } + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradesConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradesConfigDialog.kt new file mode 100644 index 00000000..20325447 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/grade/GradesConfigDialog.kt @@ -0,0 +1,164 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-16 + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.grade + +import android.annotation.SuppressLint +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.isVisible +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import it.sephiroth.android.library.numberpicker.doOnStopTrackingTouch +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.databinding.DialogConfigGradesBinding +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.COLOR_MODE_DEFAULT +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.COLOR_MODE_WEIGHTED +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.ORDER_BY_DATE_DESC +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.ORDER_BY_SUBJECT_ASC +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_1_AVG_2_AVG +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_1_AVG_2_SEM +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_1_SEM_2_AVG +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_1_SEM_2_SEM +import pl.szczodrzynski.edziennik.utils.managers.GradesManager.Companion.YEAR_ALL_GRADES +import java.util.* + +class GradesConfigDialog( + val activity: AppCompatActivity, + private val reloadOnDismiss: Boolean = true, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) { + companion object { + const val TAG = "GradesConfigDialog" + } + + private val app by lazy { activity.application as App } + private val config by lazy { app.config.grades } + private val profileConfig by lazy { app.config.getFor(app.profileId).grades } + + private lateinit var b: DialogConfigGradesBinding + private lateinit var dialog: AlertDialog + + init { run { + if (activity.isFinishing) + return@run + b = DialogConfigGradesBinding.inflate(activity.layoutInflater) + onShowListener?.invoke(TAG) + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.menu_grades_config) + .setView(b.root) + .setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() } + .setOnDismissListener { + saveConfig() + onDismissListener?.invoke(TAG) + if (reloadOnDismiss) (activity as? MainActivity)?.reloadTarget() + } + .create() + initView() + loadConfig() + dialog.show() + }} + + @SuppressLint("SetTextI18n") + private fun loadConfig() { + b.customPlusCheckBox.isChecked = profileConfig.plusValue != null + b.customPlusValue.isVisible = b.customPlusCheckBox.isChecked + b.customMinusCheckBox.isChecked = profileConfig.minusValue != null + b.customMinusValue.isVisible = b.customMinusCheckBox.isChecked + + b.customPlusValue.progress = profileConfig.plusValue ?: 0.5f + b.customMinusValue.progress = profileConfig.minusValue ?: 0.25f + + when (config.orderBy) { + ORDER_BY_DATE_DESC -> b.sortGradesByDateRadio + ORDER_BY_SUBJECT_ASC -> b.sortGradesBySubjectRadio + else -> null + }?.isChecked = true + + when (profileConfig.colorMode) { + COLOR_MODE_DEFAULT -> b.gradeColorFromERegister + COLOR_MODE_WEIGHTED -> b.gradeColorByValue + else -> null + }?.isChecked = true + + when (profileConfig.yearAverageMode) { + YEAR_ALL_GRADES -> b.gradeAverageMode4 + YEAR_1_AVG_2_AVG -> b.gradeAverageMode0 + YEAR_1_SEM_2_AVG -> b.gradeAverageMode1 + YEAR_1_AVG_2_SEM -> b.gradeAverageMode2 + YEAR_1_SEM_2_SEM -> b.gradeAverageMode3 + else -> null + }?.isChecked = true + + b.dontCountGrades.isChecked = profileConfig.dontCountEnabled && profileConfig.dontCountGrades.isNotEmpty() + b.hideImproved.isChecked = profileConfig.hideImproved + b.averageWithoutWeight.isChecked = profileConfig.averageWithoutWeight + + if (profileConfig.dontCountGrades.isEmpty()) { + b.dontCountGradesText.setText("nb, 0, bz, bd") + } + else { + b.dontCountGradesText.setText(profileConfig.dontCountGrades.join(", ")) + } + } + + private fun saveConfig() { + profileConfig.plusValue = if (b.customPlusCheckBox.isChecked) b.customPlusValue.progress else null + profileConfig.minusValue = if (b.customMinusCheckBox.isChecked) b.customMinusValue.progress else null + + b.dontCountGradesText.setText( + b.dontCountGradesText + .text + ?.toString() + ?.toLowerCase(Locale.getDefault()) + ?.replace(", ", ",") + ) + profileConfig.dontCountEnabled = b.dontCountGrades.isChecked + profileConfig.dontCountGrades = b.dontCountGradesText.text + ?.split(",") + ?.map { it.trim() } + ?: listOf() + } + + private fun initView() { + b.customPlusCheckBox.onChange { _, isChecked -> + b.customPlusValue.isVisible = isChecked + } + b.customMinusCheckBox.onChange { _, isChecked -> + b.customMinusValue.isVisible = isChecked + } + + // who the hell named those methods + // THIS SHIT DOES NOT EVEN WORK + b.customPlusValue.doOnStopTrackingTouch { + profileConfig.plusValue = it.progress + } + b.customMinusValue.doOnStopTrackingTouch { + profileConfig.minusValue = it.progress + } + + b.sortGradesByDateRadio.setOnSelectedListener { config.orderBy = ORDER_BY_DATE_DESC } + b.sortGradesBySubjectRadio.setOnSelectedListener { config.orderBy = ORDER_BY_SUBJECT_ASC } + + b.gradeColorFromERegister.setOnSelectedListener { profileConfig.colorMode = COLOR_MODE_DEFAULT } + b.gradeColorByValue.setOnSelectedListener { profileConfig.colorMode = COLOR_MODE_WEIGHTED } + + b.gradeAverageMode4.setOnSelectedListener { profileConfig.yearAverageMode = YEAR_ALL_GRADES } + b.gradeAverageMode0.setOnSelectedListener { profileConfig.yearAverageMode = YEAR_1_AVG_2_AVG } + b.gradeAverageMode1.setOnSelectedListener { profileConfig.yearAverageMode = YEAR_1_SEM_2_AVG } + b.gradeAverageMode2.setOnSelectedListener { profileConfig.yearAverageMode = YEAR_1_AVG_2_SEM } + b.gradeAverageMode3.setOnSelectedListener { profileConfig.yearAverageMode = YEAR_1_SEM_2_SEM } + + b.hideImproved.onChange { _, isChecked -> profileConfig.hideImproved = isChecked } + b.averageWithoutWeight.onChange { _, isChecked -> profileConfig.averageWithoutWeight = isChecked } + + b.averageWithoutWeightHelp.onClick { + MaterialAlertDialogBuilder(activity) + .setTitle(R.string.grades_config_average_without_weight) + .setMessage(R.string.grades_config_average_without_weight_message) + .setPositiveButton(R.string.ok, null) + .show() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/home/StudentNumberDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/home/StudentNumberDialog.kt index 56785d98..3f3f8176 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/home/StudentNumberDialog.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/home/StudentNumberDialog.kt @@ -5,12 +5,11 @@ package pl.szczodrzynski.edziennik.ui.dialogs.home import android.text.InputType -import android.widget.Toast -import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity -import com.afollestad.materialdialogs.MaterialDialog +import com.google.android.material.dialog.MaterialAlertDialogBuilder import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.ui.dialogs.input class StudentNumberDialog( val activity: AppCompatActivity, @@ -22,25 +21,27 @@ class StudentNumberDialog( private const val TAG = "StudentNumberDialog" } - private lateinit var dialog: AlertDialog - init { run { if (activity.isFinishing) return@run onShowListener?.invoke(TAG) - MaterialDialog.Builder(activity) - .title(R.string.card_lucky_number_set_title) - .content(R.string.card_lucky_number_set_text) - .inputType(InputType.TYPE_CLASS_NUMBER) - .input(null, if (profile.studentNumber == -1) "" else profile.studentNumber.toString()) { _: MaterialDialog?, input: CharSequence -> - try { - profile.studentNumber = input.toString().toInt() - } catch (e: Exception) { - Toast.makeText(activity, R.string.incorrect_format, Toast.LENGTH_SHORT).show() - } + MaterialAlertDialogBuilder(activity) + .setTitle(R.string.card_lucky_number_set_title) + .input( + message = activity.getString(R.string.card_lucky_number_set_text), + type = InputType.TYPE_CLASS_NUMBER, + hint = null, + value = if (profile.studentNumber == -1) null else profile.studentNumber.toString(), + positiveButton = R.string.ok, + positiveListener = { _, input -> + profile.studentNumber = input.toIntOrNull() ?: -1 + true } - .dismissListener { - onDismissListener?.invoke(TAG) - }.show() + ) + .setNegativeButton(R.string.cancel, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() }} -} \ No newline at end of file +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeAdapter.kt new file mode 100644 index 00000000..b15803ed --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeAdapter.kt @@ -0,0 +1,189 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-12-19. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.lessonchange + +import android.content.Context +import android.graphics.PorterDuff +import android.graphics.PorterDuffColorFilter +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.core.view.updateLayoutParams +import androidx.recyclerview.widget.RecyclerView +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.db.entity.Lesson +import pl.szczodrzynski.edziennik.data.db.full.LessonFull +import pl.szczodrzynski.edziennik.databinding.TimetableLessonBinding +import pl.szczodrzynski.navlib.getColorFromAttr + +class LessonChangeAdapter( + val context: Context, + private val onItemClick: ((lesson: LessonFull) -> Unit)? = null +) : RecyclerView.Adapter() { + + var items = listOf() + + private val arrowRight = " → " + private val bullet = " • " + private val colorSecondary = android.R.attr.textColorSecondary.resolveAttr(context) + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + val inflater = LayoutInflater.from(parent.context) + val view = TimetableLessonBinding.inflate(inflater, parent, false) + return ViewHolder(view) + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val lesson = items[position] + val b = holder.b + + b.root.onClick { + onItemClick?.invoke(lesson) + } + + val startTime = lesson.displayStartTime ?: return + val endTime = lesson.displayEndTime ?: return + + val timeRange = "${startTime.stringHM} - ${endTime.stringHM}".asColoredSpannable(colorSecondary) + + b.unread = false + b.root.background = null + + b.root.updateLayoutParams { + topMargin = 16.dp + } + + // teacher + val teacherInfo = if (lesson.teacherId != null && lesson.teacherId == lesson.oldTeacherId) + lesson.teacherName ?: "?" + else + mutableListOf().apply { + lesson.oldTeacherName?.let { add(it.asStrikethroughSpannable()) } + lesson.teacherName?.let { add(it) } + }.concat(arrowRight) + + // team + val teamInfo = if (lesson.teamId != null && lesson.teamId == lesson.oldTeamId) + lesson.teamName ?: "?" + else + mutableListOf().apply { + lesson.oldTeamName?.let { add(it.asStrikethroughSpannable()) } + lesson.teamName?.let { add(it) } + }.concat(arrowRight) + + // classroom + val classroomInfo = if (lesson.classroom != null && lesson.classroom == lesson.oldClassroom) + lesson.classroom ?: "?" + else + mutableListOf().apply { + lesson.oldClassroom?.let { add(it.asStrikethroughSpannable()) } + lesson.classroom?.let { add(it) } + }.concat(arrowRight) + + + b.lessonNumber = lesson.displayLessonNumber + b.subjectName.text = lesson.displaySubjectName?.let { + if (lesson.type == Lesson.TYPE_CANCELLED || lesson.type == Lesson.TYPE_SHIFTED_SOURCE) + it.asStrikethroughSpannable().asColoredSpannable(colorSecondary) + else + it + } + b.detailsFirst.text = listOfNotEmpty(timeRange, classroomInfo).concat(bullet) + b.detailsSecond.text = listOfNotEmpty(teacherInfo, teamInfo).concat(bullet) + + //lb.subjectName.typeface = Typeface.create("sans-serif-light", Typeface.BOLD) + when (lesson.type) { + Lesson.TYPE_NORMAL -> { + b.annotationVisible = false + } + Lesson.TYPE_CANCELLED -> { + b.annotationVisible = true + b.annotation.setText(R.string.timetable_lesson_cancelled) + b.annotation.background.colorFilter = PorterDuffColorFilter( + getColorFromAttr(context, R.attr.timetable_lesson_cancelled_color), + PorterDuff.Mode.SRC_ATOP + ) + //lb.subjectName.typeface = Typeface.DEFAULT + } + Lesson.TYPE_CHANGE -> { + b.annotationVisible = true + when { + lesson.subjectId != lesson.oldSubjectId && lesson.teacherId != lesson.oldTeacherId + && lesson.oldSubjectName != null && lesson.oldTeacherName != null -> + b.annotation.setText( + R.string.timetable_lesson_change_format, + "${lesson.oldSubjectName ?: "?"}, ${lesson.oldTeacherName ?: "?"}" + ) + + lesson.subjectId != lesson.oldSubjectId && lesson.oldSubjectName != null -> + b.annotation.setText( + R.string.timetable_lesson_change_format, + lesson.oldSubjectName ?: "?" + ) + + lesson.teacherId != lesson.oldTeacherId && lesson.oldTeacherName != null -> + b.annotation.setText( + R.string.timetable_lesson_change_format, + lesson.oldTeacherName ?: "?" + ) + else -> b.annotation.setText(R.string.timetable_lesson_change) + } + + b.annotation.background.colorFilter = PorterDuffColorFilter( + getColorFromAttr(context, R.attr.timetable_lesson_change_color), + PorterDuff.Mode.SRC_ATOP + ) + } + Lesson.TYPE_SHIFTED_SOURCE -> { + b.annotationVisible = true + when { + lesson.date != lesson.oldDate && lesson.date != null -> + b.annotation.setText( + R.string.timetable_lesson_shifted_other_day, + lesson.date?.stringY_m_d ?: "?", + lesson.startTime?.stringHM ?: "" + ) + + lesson.startTime != lesson.oldStartTime && lesson.startTime != null -> + b.annotation.setText( + R.string.timetable_lesson_shifted_same_day, + lesson.startTime?.stringHM ?: "?" + ) + + else -> b.annotation.setText(R.string.timetable_lesson_shifted) + } + + b.annotation.background.setTintColor(R.attr.timetable_lesson_shifted_source_color.resolveAttr(context)) + } + Lesson.TYPE_SHIFTED_TARGET -> { + b.annotationVisible = true + when { + lesson.date != lesson.oldDate && lesson.oldDate != null -> + b.annotation.setText( + R.string.timetable_lesson_shifted_from_other_day, + lesson.oldDate?.stringY_m_d ?: "?", + lesson.oldStartTime?.stringHM ?: "" + ) + + lesson.startTime != lesson.oldStartTime && lesson.oldStartTime != null -> + b.annotation.setText( + R.string.timetable_lesson_shifted_from_same_day, + lesson.oldStartTime?.stringHM ?: "?" + ) + + else -> b.annotation.setText(R.string.timetable_lesson_shifted_from) + } + + b.annotation.background.colorFilter = PorterDuffColorFilter( + getColorFromAttr(context, R.attr.timetable_lesson_shifted_target_color), + PorterDuff.Mode.SRC_ATOP + ) + } + } + } + + override fun getItemCount() = items.size + + class ViewHolder(val b: TimetableLessonBinding) : RecyclerView.ViewHolder(b.root) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java deleted file mode 100644 index 4a298324..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.java +++ /dev/null @@ -1,77 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.dialogs.lessonchange; - -import android.content.Context; -import android.view.View; - -import androidx.databinding.DataBindingUtil; -import androidx.lifecycle.LifecycleOwner; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.afollestad.materialdialogs.MaterialDialog; - -import java.util.ArrayList; -import java.util.List; - -import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableAdapter; -import pl.szczodrzynski.edziennik.databinding.DialogLessonChangeListBinding; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull; -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.utils.models.Time; - -public class LessonChangeDialog { - private App app; - private Context context; - private int profileId; - - public LessonChangeDialog(Context context) { - this.context = context; - this.profileId = App.profileId; - } - public LessonChangeDialog(Context context, int profileId) { - this.context = context; - this.profileId = profileId; - } - - private MaterialDialog dialog; - private DialogLessonChangeListBinding b; - - public void show(App _app, Date date) - { - this.app = _app; - dialog = new MaterialDialog.Builder(context) - .title(date.getFormattedString()) - .customView(R.layout.dialog_lesson_change_list, false) - .positiveText(R.string.close) - .autoDismiss(false) - .onPositive((dialog, which) -> dialog.dismiss()) - .show(); - if (dialog.getCustomView() == null) - return; - b = DataBindingUtil.bind(dialog.getCustomView()); - if (b == null) - return; - - b.lessonChangeView.setHasFixedSize(true); - b.lessonChangeView.setLayoutManager(new LinearLayoutManager(context)); - - app.db.lessonDao().getAllByDate(profileId, date, Time.getNow()).observe((LifecycleOwner) context, lessons -> { - if (app == null || app.profile == null || b == null) - return; - - List changedLessons = new ArrayList<>(); - for (LessonFull lesson: lessons) { - if (lesson.changeId != 0) { - changedLessons.add(lesson); - } - } - - app.db.eventDao().getAllByDate(profileId, date).observe((LifecycleOwner) context, events -> { - TimetableAdapter adapter = new TimetableAdapter(context, date, changedLessons, events == null ? new ArrayList<>() : events); - b.lessonChangeView.setAdapter(adapter); - b.lessonChangeView.setVisibility(View.VISIBLE); - }); - }); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.kt new file mode 100644 index 00000000..78d40e68 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/lessonchange/LessonChangeDialog.kt @@ -0,0 +1,76 @@ +package pl.szczodrzynski.edziennik.ui.dialogs.lessonchange + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.* +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.databinding.DialogLessonChangeListBinding +import pl.szczodrzynski.edziennik.ui.dialogs.timetable.LessonDetailsDialog +import pl.szczodrzynski.edziennik.utils.models.Date +import kotlin.coroutines.CoroutineContext + +class LessonChangeDialog( + val activity: AppCompatActivity, + val profileId: Int, + private val defaultDate: Date, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + const val TAG = "LessonChangeDialog" + } + + private val app by lazy { activity.application as App } + + private lateinit var job: Job + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + private lateinit var b: DialogLessonChangeListBinding + private lateinit var dialog: AlertDialog + + init { run { + if (activity.isFinishing) + return@run + job = Job() + onShowListener?.invoke(TAG) + b = DialogLessonChangeListBinding.inflate(activity.layoutInflater) + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(defaultDate.formattedString) + .setView(b.root) + .setPositiveButton(R.string.close) { dialog, _ -> dialog.dismiss() } + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .create() + loadLessonChanges() + }} + + private fun loadLessonChanges() { launch { + val lessonChanges = withContext(Dispatchers.Default) { + app.db.timetableDao().getChangesForDateNow(profileId, defaultDate) + } + + val adapter = LessonChangeAdapter( + activity, + onItemClick = { + LessonDetailsDialog( + activity, + it, + onShowListener = onShowListener, + onDismissListener = onDismissListener + ) + } + ).apply { + items = lessonChanges + } + + b.lessonChangeView.adapter = adapter + b.lessonChangeView.layoutManager = LinearLayoutManager(activity) + + dialog.show() + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileConfigDialog.kt new file mode 100644 index 00000000..e9204090 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileConfigDialog.kt @@ -0,0 +1,100 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-23. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.profile + +import android.content.res.ColorStateList +import androidx.appcompat.app.AlertDialog +import androidx.core.widget.addTextChangedListener +import com.google.android.material.color.MaterialColors +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.google.android.material.shape.MaterialShapeDrawable +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.databinding.DialogProfileConfigBinding +import kotlin.coroutines.CoroutineContext + +class ProfileConfigDialog( + val activity: MainActivity, + val profile: Profile, + val onProfileSaved: ((profile: Profile) -> Unit)? = null, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "ProfileConfigDialog" + } + + private lateinit var app: App + private lateinit var b: DialogProfileConfigBinding + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local variables go here + private var profileChanged = false + private var profileRemoved = false + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + b = DialogProfileConfigBinding.inflate(activity.layoutInflater) + dialog = MaterialAlertDialogBuilder(activity) + .setView(b.root) + .setPositiveButton(R.string.close, null) + .setOnDismissListener { + if (!profileRemoved && profileChanged) { + app.profileSave(profile) + onProfileSaved?.invoke(profile) + } + onDismissListener?.invoke(TAG) + } + .show() + + b.profile = profile + profile.applyImageTo(b.image) + + // I can't believe how simple it is to get the dialog's background color !! + val shape = MaterialShapeDrawable(activity, null, R.attr.alertDialogStyle, R.style.MaterialAlertDialog_MaterialComponents) + val surface = MaterialColors.getColor(activity, R.attr.colorSurface, TAG) + shape.setCornerSize(18.dp.toFloat()) + shape.initializeElevationOverlay(activity) + shape.fillColor = ColorStateList.valueOf(surface) + shape.elevation = 16.dp.toFloat() + b.circleView.background = shape + + b.nameEdit.addTextChangedListener { + profileChanged = true + } + + b.syncSwitch.onChange { _, _ -> + profileChanged = true + } + + b.imageButton.onClick { + activity.requestHandler.requestProfileImage(profile) { + val profile = it as? Profile ?: return@requestProfileImage + if (this@ProfileConfigDialog.profile == profile) { + profileChanged = true + b.profile = profile + b.image.setImageDrawable(profile.getImageDrawable(activity)) + } + } + } + + b.logoutButton.onClick { + ProfileRemoveDialog(activity, profile.id, profile.name) { + profileRemoved = true + dialog.dismiss() + } + } + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileRemoveDialog.kt similarity index 83% rename from app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileRemoveDialog.kt index fa626091..7071f00d 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ProfileRemoveDialog.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/profile/ProfileRemoveDialog.kt @@ -2,7 +2,7 @@ * Copyright (c) Kuba Szczodrzyński 2019-11-13. */ -package pl.szczodrzynski.edziennik.ui.dialogs.settings +package pl.szczodrzynski.edziennik.ui.dialogs.profile import android.widget.Toast import androidx.appcompat.app.AlertDialog @@ -12,14 +12,14 @@ import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.MainActivity import pl.szczodrzynski.edziennik.R import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding -import pl.szczodrzynski.edziennik.utils.models.Notification -import java.util.* import kotlin.coroutines.CoroutineContext class ProfileRemoveDialog( val activity: MainActivity, val profileId: Int, - val profileName: String + val profileName: String, + val noProfileRemoval: Boolean = false, + val onRemove: (() -> Unit)? = null ) : CoroutineScope { companion object { private const val TAG = "ProfileRemoveDialog" @@ -52,52 +52,50 @@ class ProfileRemoveDialog( val profileObject = app.db.profileDao().getByIdNow(profileId) ?: return@async app.db.announcementDao().clear(profileId) app.db.attendanceDao().clear(profileId) - app.db.eventDao().clear(profileId) - app.db.eventTypeDao().clear(profileId) - app.db.gradeDao().clear(profileId) - app.db.gradeCategoryDao().clear(profileId) - app.db.lessonDao().clear(profileId) - app.db.lessonChangeDao().clear(profileId) - app.db.luckyNumberDao().clear(profileId) - app.db.noticeDao().clear(profileId) - app.db.subjectDao().clear(profileId) - app.db.teacherDao().clear(profileId) - app.db.teamDao().clear(profileId) - app.db.messageRecipientDao().clear(profileId) - app.db.messageDao().clear(profileId) - app.db.endpointTimerDao().clear(profileId) app.db.attendanceTypeDao().clear(profileId) app.db.classroomDao().clear(profileId) + app.db.endpointTimerDao().clear(profileId) + app.db.eventDao().clear(profileId) + app.db.eventTypeDao().clear(profileId) + app.db.gradeCategoryDao().clear(profileId) + app.db.gradeDao().clear(profileId) app.db.lessonRangeDao().clear(profileId) + app.db.librusLessonDao().clear(profileId) + app.db.luckyNumberDao().clear(profileId) + app.db.messageDao().clear(profileId) + app.db.messageRecipientDao().clear(profileId) + app.db.noticeDao().clear(profileId) app.db.noticeTypeDao().clear(profileId) + app.db.notificationDao().clear(profileId) + app.db.subjectDao().clear(profileId) app.db.teacherAbsenceDao().clear(profileId) app.db.teacherAbsenceTypeDao().clear(profileId) + app.db.teacherDao().clear(profileId) + app.db.teamDao().clear(profileId) app.db.timetableDao().clear(profileId) + app.db.metadataDao().deleteAll(profileId) + + if (noProfileRemoval) + return@async + + app.db.configDao().clear(profileId) + val loginStoreId = profileObject.loginStoreId val profilesUsingLoginStore = app.db.profileDao().getIdsByLoginStoreIdNow(loginStoreId) if (profilesUsingLoginStore.size == 1) { app.db.loginStoreDao().remove(loginStoreId) } app.db.profileDao().remove(profileId) - app.db.metadataDao().deleteAll(profileId) - val toRemove = ArrayList() - for (notification in app.appConfig.notifications) { - if (notification.profileId == profileId) { - toRemove.add(notification) - } + if (App.profileId == profileId) { + app.profileLoadLast { } } - app.appConfig.notifications.removeAll(toRemove) - - app.profile = null - App.profileId = -1 - - app.profileLoadById(app.profileLastId()) } deferred.await() dialog.dismiss() activity.reloadTarget() Toast.makeText(activity, R.string.dialog_profile_remove_success, Toast.LENGTH_LONG).show() + onRemove?.invoke() }} -} \ No newline at end of file +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AppLanguageDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AppLanguageDialog.kt new file mode 100644 index 00000000..6db33e70 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AppLanguageDialog.kt @@ -0,0 +1,71 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-19. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.settings + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.* +import kotlin.coroutines.CoroutineContext + +class AppLanguageDialog( + val activity: AppCompatActivity, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "AppLanguageDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local variables go here + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + + val languages = mapOf( + null to R.string.language_system, + "pl" to R.string.language_polish, + "en" to R.string.language_english, + "de" to R.string.language_german + ) + val languageIds = languages.map { it.key } + val languageNames = languages.map { + activity.getString(it.value) + } + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.app_language_dialog_title) + //.setMessage(R.string.settings_about_language_dialog_text) + .setSingleChoiceItems( + languageNames.toTypedArray(), + languageIds.indexOf(app.config.ui.language), + null + ) + .setPositiveButton(R.string.ok) { _, _ -> + val which = dialog.listView.checkedItemPosition + + app.config.ui.language = languageIds[which] + activity.recreate() + } + .setNegativeButton(R.string.cancel, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt new file mode 100644 index 00000000..e7d66ed5 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/AttendanceConfigDialog.kt @@ -0,0 +1,75 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-4. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.settings + +import android.annotation.SuppressLint +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.databinding.AttendanceConfigDialogBinding +import pl.szczodrzynski.edziennik.onChange + +class AttendanceConfigDialog( + val activity: AppCompatActivity, + private val reloadOnDismiss: Boolean = true, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) { + companion object { + const val TAG = "GradesConfigDialog" + } + + private val app by lazy { activity.application as App } + private val profileConfig by lazy { app.config.getFor(app.profileId).attendance } + + private lateinit var b: AttendanceConfigDialogBinding + private lateinit var dialog: AlertDialog + + init { run { + if (activity.isFinishing) + return@run + b = AttendanceConfigDialogBinding.inflate(activity.layoutInflater) + onShowListener?.invoke(TAG) + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.menu_attendance_config) + .setView(b.root) + .setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() } + .setOnDismissListener { + saveConfig() + onDismissListener?.invoke(TAG) + if (reloadOnDismiss) (activity as? MainActivity)?.reloadTarget() + } + .create() + initView() + loadConfig() + dialog.show() + }} + + @SuppressLint("SetTextI18n") + private fun loadConfig() { + b.useSymbols.isChecked = profileConfig.useSymbols + b.groupConsecutiveDays.isChecked = profileConfig.groupConsecutiveDays + b.showPresenceInMonth.isChecked = profileConfig.showPresenceInMonth + } + + private fun saveConfig() { + // nothing to do here, yet + } + + private fun initView() { + b.useSymbols.onChange { _, isChecked -> + profileConfig.useSymbols = isChecked + } + b.groupConsecutiveDays.onChange { _, isChecked -> + profileConfig.groupConsecutiveDays = isChecked + } + b.showPresenceInMonth.onChange { _, isChecked -> + profileConfig.showPresenceInMonth = isChecked + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MiniMenuConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MiniMenuConfigDialog.kt new file mode 100644 index 00000000..61e95a8b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/MiniMenuConfigDialog.kt @@ -0,0 +1,96 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-18. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.settings + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_NOTIFICATIONS +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_SETTINGS +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE +import pl.szczodrzynski.edziennik.R +import kotlin.coroutines.CoroutineContext + +class MiniMenuConfigDialog( + val activity: AppCompatActivity, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "MiniMenuConfigDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local variables go here + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + + val buttons = mapOf( + DRAWER_ITEM_HOME to R.string.menu_home_page, + DRAWER_ITEM_TIMETABLE to R.string.menu_timetable, + DRAWER_ITEM_AGENDA to R.string.menu_agenda, + DRAWER_ITEM_GRADES to R.string.menu_grades, + DRAWER_ITEM_MESSAGES to R.string.menu_messages, + DRAWER_ITEM_HOMEWORK to R.string.menu_homework, + DRAWER_ITEM_BEHAVIOUR to R.string.menu_notices, + DRAWER_ITEM_ATTENDANCE to R.string.menu_attendance, + DRAWER_ITEM_ANNOUNCEMENTS to R.string.menu_announcements, + DRAWER_ITEM_NOTIFICATIONS to R.string.menu_notifications, + DRAWER_ITEM_SETTINGS to R.string.menu_settings + ) + val miniMenuButtons = app.config.ui.miniMenuButtons + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.settings_theme_mini_drawer_buttons_dialog_title) + //.setMessage(R.string.settings_theme_mini_drawer_buttons_dialog_text) + .setMultiChoiceItems( + buttons.map { activity.getString(it.value) }.toTypedArray(), + buttons.map { it.key in miniMenuButtons }.toBooleanArray(), + null + ) + .setPositiveButton(R.string.ok) { _, _ -> + app.config.ui.miniMenuButtons = + buttons.keys.mapIndexedNotNull { index, id -> + if (dialog.listView.checkedItemPositions[index]) + id + else + null + } + + if (activity is MainActivity) { + activity.setDrawerItems() + activity.drawer.updateBadges() + } + } + .setNegativeButton(R.string.cancel, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ThemeChooserDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ThemeChooserDialog.kt new file mode 100644 index 00000000..ca9b2f11 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/settings/ThemeChooserDialog.kt @@ -0,0 +1,65 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-18. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.settings + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.utils.Themes +import kotlin.coroutines.CoroutineContext + +class ThemeChooserDialog( + val activity: AppCompatActivity, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "ThemeChooserDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local variables go here + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.settings_theme_theme_text) + .setSingleChoiceItems( + Themes.getThemeNames(activity).toTypedArray(), + Themes.themeIndex, + null + ) + .setPositiveButton(R.string.ok) { _, _ -> + val which = dialog.listView.checkedItemPosition + + val theme = Themes.themeList[which] + if (app.config.ui.theme == theme.id) + return@setPositiveButton + app.config.ui.theme = theme.id + Themes.themeIndex = which + activity.recreate() + } + .setNegativeButton(R.string.cancel, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/NotificationFilterDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/NotificationFilterDialog.kt new file mode 100644 index 00000000..ad31c02d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/NotificationFilterDialog.kt @@ -0,0 +1,99 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-2-21. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.sync + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.entity.Notification +import pl.szczodrzynski.edziennik.onClick +import kotlin.coroutines.CoroutineContext + +// TODO refactor dialog to allow configuring other profiles +// than the selected one in UI +class NotificationFilterDialog( + val activity: AppCompatActivity, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "NotificationFilterDialog" + private val notificationTypes = listOf( + Notification.TYPE_TIMETABLE_LESSON_CHANGE to R.string.notification_type_timetable_lesson_change, + Notification.TYPE_NEW_GRADE to R.string.notification_type_new_grade, + Notification.TYPE_NEW_EVENT to R.string.notification_type_new_event, + Notification.TYPE_NEW_HOMEWORK to R.string.notification_type_new_homework, + Notification.TYPE_NEW_MESSAGE to R.string.notification_type_new_message, + Notification.TYPE_LUCKY_NUMBER to R.string.notification_type_lucky_number, + Notification.TYPE_NEW_NOTICE to R.string.notification_type_notice, + Notification.TYPE_NEW_ATTENDANCE to R.string.notification_type_attendance, + Notification.TYPE_NEW_ANNOUNCEMENT to R.string.notification_type_new_announcement, + Notification.TYPE_NEW_SHARED_EVENT to R.string.notification_type_new_shared_event, + Notification.TYPE_NEW_SHARED_HOMEWORK to R.string.notification_type_new_shared_homework, + Notification.TYPE_REMOVED_SHARED_EVENT to R.string.notification_type_removed_shared_event, + Notification.TYPE_TEACHER_ABSENCE to R.string.notification_type_new_teacher_absence + ) + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + private val notificationFilter = mutableListOf() + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + + notificationFilter.clear() + notificationFilter += app.config.forProfile().sync.notificationFilter + val items = notificationTypes.map { app.getString(it.second) }.toTypedArray() + val checkedItems = notificationTypes.map { !notificationFilter.contains(it.first) }.toBooleanArray() + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.dialog_notification_filter_title) + //.setMessage(R.string.dialog_notification_filter_text) + .setMultiChoiceItems(items, checkedItems) { _, which, isChecked -> + val type = notificationTypes[which].first + notificationFilter.remove(type) + if (!isChecked) + notificationFilter += type + } + .setPositiveButton(R.string.ok, null) + .setNegativeButton(R.string.cancel, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + + dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.onClick { + if (notificationFilter.isEmpty()) { + app.config.forProfile().sync.notificationFilter = notificationFilter + dialog.dismiss() + return@onClick + } + // warn user when he tries to disable some notifications + MaterialAlertDialogBuilder(activity) + .setTitle(R.string.are_you_sure) + .setMessage(R.string.notification_filter_warning) + .setPositiveButton(R.string.ok) { _, _ -> + app.config.forProfile().sync.notificationFilter = notificationFilter + dialog.dismiss() + } + .setNegativeButton(R.string.cancel, null) + .show() + } + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/QuietHoursConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/QuietHoursConfigDialog.kt new file mode 100644 index 00000000..5c933e20 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/QuietHoursConfigDialog.kt @@ -0,0 +1,107 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-20. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.sync + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.google.android.material.timepicker.MaterialTimePicker +import com.google.android.material.timepicker.TimeFormat +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.utils.models.Time +import kotlin.coroutines.CoroutineContext + +class QuietHoursConfigDialog( + val activity: AppCompatActivity, + val onChangeListener: (() -> Unit)? = null, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "QuietHoursConfigDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local variables go here + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.settings_sync_quiet_hours_dialog_title) + .setItems(arrayOf( + activity.getString(R.string.settings_sync_quiet_hours_set_beginning), + activity.getString(R.string.settings_sync_quiet_hours_set_end) + )) { dialog, which -> + when (which) { + 0 -> configStartTime() + 1 -> configEndTime() + } + dialog.dismiss() + } + .setNegativeButton(R.string.cancel, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + }} + + private fun configStartTime() { + onShowListener?.invoke(TAG + "Start") + + val time = app.config.sync.quietHoursStart ?: return + val picker = MaterialTimePicker.Builder() + .setTitleText(R.string.settings_sync_quiet_hours_set_beginning) + .setTimeFormat(TimeFormat.CLOCK_24H) + .setHour(time.hour) + .setMinute(time.minute) + .build() + + picker.show(activity.supportFragmentManager, TAG) + picker.addOnPositiveButtonClickListener { + app.config.sync.quietHoursEnabled = true + app.config.sync.quietHoursStart = Time(picker.hour, picker.minute, 0) + onChangeListener?.invoke() + } + picker.addOnDismissListener { + onDismissListener?.invoke(TAG + "Start") + } + } + + private fun configEndTime() { + onShowListener?.invoke(TAG + "End") + + val time = app.config.sync.quietHoursEnd ?: return + val picker = MaterialTimePicker.Builder() + .setTitleText(R.string.settings_sync_quiet_hours_set_end) + .setTimeFormat(TimeFormat.CLOCK_24H) + .setHour(time.hour) + .setMinute(time.minute) + .build() + + picker.show(activity.supportFragmentManager, TAG) + picker.addOnPositiveButtonClickListener { + app.config.sync.quietHoursEnabled = true + app.config.sync.quietHoursEnd = Time(picker.hour, picker.minute, 0) + onChangeListener?.invoke() + } + picker.addOnDismissListener { + onDismissListener?.invoke(TAG + "End") + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegistrationConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegistrationConfigDialog.kt new file mode 100644 index 00000000..fff65b43 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/RegistrationConfigDialog.kt @@ -0,0 +1,149 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-3-15. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.sync + +import android.text.Html +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.* +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi +import pl.szczodrzynski.edziennik.data.api.task.AppSync +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import kotlin.coroutines.CoroutineContext + +class RegistrationConfigDialog( + val activity: AppCompatActivity, + val profile: Profile, + val onChangeListener: ((enabled: Boolean) -> Unit)? = null, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "RegistrationEnableDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local variables go here + + init { run { + if (activity.isFinishing) + return@run + app = activity.applicationContext as App + }} + + fun showEventShareDialog() { + onShowListener?.invoke(TAG + "EventShare") + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.registration_config_event_sharing_title) + .setMessage(R.string.registration_config_event_sharing_text) + .setPositiveButton(R.string.i_agree) { _, _ -> + enableRegistration() + } + .setNegativeButton(R.string.cancel, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG + "EventShare") + } + .show() + } + + fun showEnableDialog() { + onShowListener?.invoke(TAG + "Enable") + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.registration_config_title) + .setMessage(Html.fromHtml(app.getString(R.string.registration_config_enable_text))) + .setPositiveButton(R.string.i_agree) { _, _ -> + enableRegistration() + } + .setNegativeButton(R.string.i_disagree, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG + "Enable") + } + .show() + } + + fun showDisableDialog() { + onShowListener?.invoke(TAG + "Disable") + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.registration_config_title) + .setMessage(Html.fromHtml(app.getString(R.string.registration_config_disable_text))) + .setPositiveButton(R.string.ok) { _, _ -> + disableRegistration() + } + .setNegativeButton(R.string.cancel, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG + "Disable") + } + .show() + } + + private fun enableRegistration() = launch { + onShowListener?.invoke(TAG + "Enabling") + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.please_wait) + .setMessage(R.string.registration_config_enable_progress_text) + .setCancelable(false) + .setOnDismissListener { + onDismissListener?.invoke(TAG + "Enabling") + } + .show() + + withContext(Dispatchers.Default) { + profile.registration = Profile.REGISTRATION_ENABLED + + // force full registration of the user + App.config.getFor(profile.id).hash = "" + + SzkolnyApi(app).runCatching(activity) { + AppSync(app, mutableListOf(), listOf(profile), this).run( + 0L, + markAsSeen = true + ) + } + app.db.profileDao().add(profile) + if (profile.id == App.profileId) { + App.profile.registration = profile.registration + } + } + + dialog.dismiss() + onChangeListener?.invoke(true) + } + + private fun disableRegistration() = launch { + onShowListener?.invoke(TAG + "Disabling") + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.please_wait) + .setMessage(R.string.registration_config_disable_progress_text) + .setCancelable(false) + .setOnDismissListener { + onDismissListener?.invoke(TAG + "Disabling") + } + .show() + + withContext(Dispatchers.Default) { + profile.registration = Profile.REGISTRATION_DISABLED + + SzkolnyApi(app).runCatching(activity) { + unregisterAppUser(profile.userCode) + } + app.db.profileDao().add(profile) + if (profile.id == App.profileId) { + App.profile.registration = profile.registration + } + } + + dialog.dismiss() + onChangeListener?.invoke(false) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncIntervalDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncIntervalDialog.kt new file mode 100644 index 00000000..6f4f027b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncIntervalDialog.kt @@ -0,0 +1,77 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-20. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.sync + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.* +import kotlin.coroutines.CoroutineContext + +class SyncIntervalDialog( + val activity: AppCompatActivity, + val onChangeListener: (() -> Unit)? = null, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "SyncIntervalDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local variables go here + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + + val intervals = listOf( + 30 * MINUTE, + 45 * MINUTE, + 60 * MINUTE, + 90 * MINUTE, + 2 * HOUR, + 3 * HOUR, + 4 * HOUR, + 6 * HOUR, + 10 * HOUR + ) + val intervalNames = intervals.map { + activity.getSyncInterval(it.toInt()) + } + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.settings_sync_sync_interval_dialog_title) + //.setMessage(R.string.settings_sync_sync_interval_dialog_text) + .setSingleChoiceItems( + intervalNames.toTypedArray(), + intervals.indexOf(app.config.sync.interval.toLong()), + null + ) + .setPositiveButton(R.string.ok) { _, _ -> + val which = dialog.listView.checkedItemPosition + + val interval = intervals[which] + app.config.sync.interval = interval.toInt() + onChangeListener?.invoke() + } + .setNegativeButton(R.string.cancel, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt index c8c92407..b9cbd0a0 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/sync/SyncViewListDialog.kt @@ -12,7 +12,7 @@ import kotlinx.coroutines.Job import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.MainActivity import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesFragment import kotlin.coroutines.CoroutineContext diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt index b8e165d1..443d4734 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceAdapter.kt @@ -1,14 +1,13 @@ package pl.szczodrzynski.edziennik.ui.dialogs.teacherabsence import android.content.Context -import android.opengl.Visibility import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceFull +import pl.szczodrzynski.edziennik.data.db.full.TeacherAbsenceFull import pl.szczodrzynski.edziennik.utils.models.Date class TeacherAbsenceAdapter( @@ -30,7 +29,7 @@ class TeacherAbsenceAdapter( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val teacherAbsence: TeacherAbsenceFull = teacherAbsenceList[position] - holder.teacherAbsenceTeacher.text = teacherAbsence.teacherFullName + holder.teacherAbsenceTeacher.text = teacherAbsence.teacherName val time = when (teacherAbsence.timeFrom != null && teacherAbsence.timeTo != null) { true -> when (teacherAbsence.dateFrom.compareTo(teacherAbsence.dateTo)) { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceDialog.kt index 55bf8ae0..7ffab515 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceDialog.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/teacherabsence/TeacherAbsenceDialog.kt @@ -1,42 +1,57 @@ package pl.szczodrzynski.edziennik.ui.dialogs.teacherabsence -import android.content.Context import android.view.View -import androidx.databinding.DataBindingUtil +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager -import com.afollestad.materialdialogs.MaterialDialog +import com.google.android.material.dialog.MaterialAlertDialogBuilder import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.R import pl.szczodrzynski.edziennik.databinding.DialogTeacherAbsenceListBinding import pl.szczodrzynski.edziennik.utils.models.Date -class TeacherAbsenceDialog(val context: Context) { +class TeacherAbsenceDialog( + val activity: AppCompatActivity, + val profileId: Int, + val date: Date, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) { + companion object { + private const val TAG = "TeacherAbsenceDialog" + } + + private val app by lazy { activity.application as App } - val profileId: Int = App.profileId private lateinit var b: DialogTeacherAbsenceListBinding + private lateinit var dialog: AlertDialog - fun show(app: App, date: Date) { - val dialog = MaterialDialog.Builder(context) - .title(date.formattedString) - .customView(R.layout.dialog_teacher_absence_list, false) - .positiveText(R.string.close) - .autoDismiss(false) - .onPositive { dialog, _ -> dialog.dismiss()} - .show() + init { run { + if (activity.isFinishing) + return@run - val customView: View = dialog.customView ?: return - b = DataBindingUtil.bind(customView) ?: return + b = DialogTeacherAbsenceListBinding.inflate(activity.layoutInflater) + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(date.formattedString) + .setView(b.root) + .setPositiveButton(R.string.close) { dialog, _ -> dialog.dismiss() } + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .create() b.teacherAbsenceView.setHasFixedSize(true) - b.teacherAbsenceView.layoutManager = LinearLayoutManager(context) + b.teacherAbsenceView.layoutManager = LinearLayoutManager(activity) - app.db.teacherAbsenceDao().getAllByDateFull(profileId, date).observe(context as LifecycleOwner, Observer { absenceList -> - val adapter = TeacherAbsenceAdapter(context, date, absenceList) + app.db.teacherAbsenceDao().getAllByDate(profileId, date).observe(activity as LifecycleOwner, Observer { absenceList -> + val adapter = TeacherAbsenceAdapter(activity, date, absenceList) b.teacherAbsenceView.adapter = adapter b.teacherAbsenceView.visibility = View.VISIBLE }) - } + dialog.show() + }} } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt new file mode 100644 index 00000000..9eefffd0 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt @@ -0,0 +1,429 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-5 + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.timetable + +import android.content.ContentResolver +import android.content.ContentValues +import android.content.Intent +import android.graphics.* +import android.net.Uri +import android.os.Build +import android.os.Environment +import android.provider.MediaStore +import android.util.Log +import android.view.View +import android.view.View.MeasureSpec +import android.widget.LinearLayout +import android.widget.TextView +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.cardview.widget.CardView +import androidx.core.content.FileProvider +import com.google.android.material.datepicker.MaterialDatePicker +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.* +import org.greenrobot.eventbus.EventBus +import org.greenrobot.eventbus.Subscribe +import org.greenrobot.eventbus.ThreadMode +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask +import pl.szczodrzynski.edziennik.data.api.events.ApiTaskAllFinishedEvent +import pl.szczodrzynski.edziennik.data.api.events.ApiTaskErrorEvent +import pl.szczodrzynski.edziennik.data.api.events.ApiTaskFinishedEvent +import pl.szczodrzynski.edziennik.data.db.entity.Lesson +import pl.szczodrzynski.edziennik.data.db.full.LessonFull +import pl.szczodrzynski.edziennik.databinding.DialogGenerateBlockTimetableBinding +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time +import pl.szczodrzynski.edziennik.utils.models.Week +import java.io.File +import java.io.FileOutputStream +import kotlin.coroutines.CoroutineContext +import kotlin.math.roundToInt + +class GenerateBlockTimetableDialog( + val activity: AppCompatActivity, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + const val TAG = "GenerateBlockTimetableDialog" + + private const val WIDTH_CONSTANT = 70 + private const val WIDTH_WEEKDAY = 285 + private const val WIDTH_SPACING = 15 + private const val HEIGHT_CONSTANT = 60 + private const val HEIGHT_MINUTE = 3 + private const val HEIGHT_FOOTER = 40 + } + + private val heightProfileName by lazy { if (showProfileName) 100 else 0 } + + private val app by lazy { activity.application as App } + + private val job: Job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + private lateinit var dialog: AlertDialog + private lateinit var b: DialogGenerateBlockTimetableBinding + + private var showProfileName: Boolean = false + private var showTeachersNames: Boolean = true + private var noColors: Boolean = false + + private var enqueuedWeekDialog: AlertDialog? = null + private var enqueuedWeekStart = Date.getToday() + private var enqueuedWeekEnd = Date.getToday() + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + EventBus.getDefault().register(this) + + val weekCurrentStart = Week.getWeekStart() + val weekCurrentEnd = Week.getWeekEnd() + val weekNextStart = weekCurrentEnd.clone().stepForward(0, 0, 1) + val weekNextEnd = weekNextStart.clone().stepForward(0, 0, 6) + + b = DialogGenerateBlockTimetableBinding.inflate(activity.layoutInflater) + + b.withChangesCurrentWeekRadio.setText(R.string.timetable_generate_current_week_format, weekCurrentStart.formattedStringShort, weekCurrentEnd.formattedStringShort) + b.withChangesNextWeekRadio.setText(R.string.timetable_generate_next_week_format, weekNextStart.formattedStringShort, weekCurrentEnd.formattedStringShort) + + b.showProfileNameCheckbox.setOnCheckedChangeListener { _, isChecked -> showProfileName = isChecked } + b.showTeachersNamesCheckbox.setOnCheckedChangeListener { _, isChecked -> showTeachersNames = isChecked } + b.noColorsCheckbox.setOnCheckedChangeListener { _, isChecked -> noColors = isChecked } + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.timetable_generate_range) + .setView(b.root) + .setNeutralButton(R.string.cancel) { dialog, _ -> dialog.dismiss() } + .setPositiveButton(R.string.save, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + EventBus.getDefault().unregister(this@GenerateBlockTimetableDialog) + } + .show() + + dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.onClick { + app.permissionManager.requestStoragePermission(activity, permissionMessage = R.string.permissions_generate_timetable) { + when (b.weekSelectionRadioGroup.checkedRadioButtonId) { + R.id.withChangesCurrentWeekRadio -> generateBlockTimetable(weekCurrentStart, weekCurrentEnd) + R.id.withChangesNextWeekRadio -> generateBlockTimetable(weekNextStart, weekNextEnd) + R.id.forSelectedWeekRadio -> selectDate() + } + } + } + }} + + private fun selectDate() { + MaterialDatePicker.Builder.datePicker() + .setCalendarConstraints(app.profile.getSchoolYearConstrains()) + .build() + .apply { + addOnPositiveButtonClickListener { millis -> + val dateSelected = Date.fromMillisUtc(millis) + generateBlockTimetable(dateSelected.weekStart, dateSelected.weekEnd) + } + } + .show(activity.supportFragmentManager, TAG) + } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun onApiTaskFinishedEvent(event: ApiTaskFinishedEvent) { + if (event.profileId == App.profileId) { + enqueuedWeekDialog?.dismiss() + generateBlockTimetable(enqueuedWeekStart, enqueuedWeekEnd) + } + } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun onApiTaskAllFinishedEvent(event: ApiTaskAllFinishedEvent) { + enqueuedWeekDialog?.dismiss() + } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun onApiTaskErrorEvent(event: ApiTaskErrorEvent) { + dialog.dismiss() + enqueuedWeekDialog?.dismiss() + } + + private fun generateBlockTimetable(weekStart: Date, weekEnd: Date) { launch { + val weekDays = mutableListOf>() + for (i in weekStart.weekDay..weekEnd.weekDay) { + weekDays.add(mutableListOf()) + } + + val allLessons = withContext(Dispatchers.Default) { + app.db.timetableDao().getBetweenDatesNow(weekStart, weekEnd) + } + val lessonRanges = mutableMapOf() + + var maxWeekDay = 5 + var minTime: Time? = null + var maxTime: Time? = null + + val lessons: List = allLessons.mapNotNull { lesson -> + if (lesson.profileId != app.profile.id || lesson.type == Lesson.TYPE_NO_LESSONS + || lesson.displayDate == null || lesson.displayStartTime == null || lesson.displayEndTime == null) + return@mapNotNull null + + if (lesson.displayDate!!.weekDay > maxWeekDay) + maxWeekDay = lesson.displayDate!!.weekDay + + lessonRanges[lesson.displayStartTime!!.value] = lesson.displayEndTime!!.value + weekDays[lesson.displayDate!!.weekDay].add(lesson) + + if (minTime == null || lesson.displayStartTime!! < minTime!!) { + minTime = lesson.displayStartTime!!.clone() + } + + if (maxTime == null || lesson.displayEndTime!! > maxTime!!) { + maxTime = lesson.displayEndTime!!.clone() + } + + return@mapNotNull lesson + } + + if (lessons.isEmpty()) { + if (enqueuedWeekDialog != null) { + return@launch + } + enqueuedWeekDialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.please_wait) + .setMessage(R.string.timetable_syncing_text) + .setCancelable(false) + .show() + + enqueuedWeekStart = weekStart + enqueuedWeekEnd = weekEnd + + EdziennikTask.syncProfile( + profileId = App.profileId, + viewIds = listOf( + MainActivity.DRAWER_ITEM_TIMETABLE to 0 + ), + arguments = JsonObject( + "weekStart" to weekStart.stringY_m_d + ) + ).enqueue(activity) + return@launch + } + + val progressDialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.timetable_generate_progress_title) + .setMessage(R.string.timetable_generate_progress_text) + .show() + + if (minTime == null) { + progressDialog.dismiss() + // TODO: Toast + return@launch + } + + dialog.dismiss() + + val uri = withContext(Dispatchers.Default) { + + val diff = Time.diff(maxTime, minTime) + + val imageWidth = WIDTH_CONSTANT + maxWeekDay * (WIDTH_WEEKDAY + WIDTH_SPACING) - WIDTH_SPACING + val imageHeight = heightProfileName + HEIGHT_CONSTANT + diff.inMinutes * HEIGHT_MINUTE + HEIGHT_FOOTER + val bitmap = Bitmap.createBitmap(imageWidth + 20, imageHeight + 30, Bitmap.Config.ARGB_8888) + val canvas = Canvas(bitmap) + + if (noColors) canvas.drawARGB(255, 255, 255, 255) + else canvas.drawARGB(255, 225, 225, 225) + + val paint = Paint().apply { + isAntiAlias = true + isFilterBitmap = true + isDither = true + } + + lessons.forEach { lesson -> + val lessonLength = Time.diff(lesson.displayEndTime, lesson.displayStartTime) + val firstOffset = Time.diff(lesson.displayStartTime, minTime) + val lessonWeekDay = lesson.displayDate!!.weekDay + + val left = WIDTH_CONSTANT + lessonWeekDay * (WIDTH_WEEKDAY + WIDTH_SPACING) + val top = heightProfileName + HEIGHT_CONSTANT + firstOffset.inMinutes * HEIGHT_MINUTE + + val blockWidth = WIDTH_WEEKDAY + val blockHeight = lessonLength.inMinutes * HEIGHT_MINUTE + + val viewWidth = 380.dp + val viewHeight = lessonLength.inMinutes * 4.dp + + val layout = activity.layoutInflater.inflate(R.layout.row_timetable_block_item, null) as LinearLayout + + val item: LinearLayout = layout.findViewById(R.id.timetableItemLayout) + val card: CardView = layout.findViewById(R.id.timetableItemCard) + val subjectName: TextView = layout.findViewById(R.id.timetableItemSubjectName) + val classroomName: TextView = layout.findViewById(R.id.timetableItemClassroomName) + val teacherName: TextView = layout.findViewById(R.id.timetableItemTeacherName) + val teamName: TextView = layout.findViewById(R.id.timetableItemTeamName) + + if (noColors) { + card.setCardBackgroundColor(Color.WHITE) + card.cardElevation = 0f + item.setBackgroundResource(R.drawable.bg_rounded_16dp_outline) + subjectName.setTextColor(Color.BLACK) + classroomName.setTextColor(0xffaaaaaa.toInt()) + teacherName.setTextColor(0xffaaaaaa.toInt()) + teamName.setTextColor(0xffaaaaaa.toInt()) + } + + subjectName.text = lesson.displaySubjectName ?: "" + classroomName.text = lesson.displayClassroom ?: "" + teacherName.text = lesson.displayTeacherName ?: "" + teamName.text = lesson.displayTeamName ?: "" + + if (!showTeachersNames) teacherName.visibility = View.GONE + + when (lesson.type) { + Lesson.TYPE_NORMAL -> { + } + Lesson.TYPE_CANCELLED, Lesson.TYPE_SHIFTED_SOURCE -> { + card.setCardBackgroundColor(Color.BLACK) + subjectName.setTextColor(Color.WHITE) + subjectName.text = lesson.displaySubjectName?.asStrikethroughSpannable() + ?: "" + } + else -> { + card.setCardBackgroundColor(0xff234158.toInt()) + subjectName.setTextColor(Color.WHITE) + subjectName.setTypeface(null, Typeface.BOLD_ITALIC) + } + } + + layout.isDrawingCacheEnabled = true + layout.measure(MeasureSpec.makeMeasureSpec(viewWidth, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(viewHeight, MeasureSpec.EXACTLY)) + layout.layout(0, 0, layout.measuredWidth, layout.measuredHeight) + layout.buildDrawingCache(true) + + val itemBitmap = layout.drawingCache + canvas.drawBitmap(itemBitmap, null, Rect(left, top, left + blockWidth, top + blockHeight), paint) + } + + val textPaint = Paint().apply { + setARGB(255, 0, 0, 0) + textAlign = Paint.Align.CENTER + textSize = 30f + isAntiAlias = true + isFilterBitmap = true + isDither = true + } + + for (w in 0..maxWeekDay) { + val x = WIDTH_CONSTANT + w * WIDTH_WEEKDAY + w * WIDTH_SPACING + canvas.drawText(Week.getFullDayName(w), x + (WIDTH_WEEKDAY / 2f), heightProfileName + HEIGHT_CONSTANT / 2 + 10f, textPaint) + } + + if (showProfileName) { + textPaint.textSize = 50f + canvas.drawText("${app.profile.name} - plan lekcji, ${weekStart.formattedStringShort} - ${weekEnd.formattedStringShort}", (imageWidth + 20) / 2f, 80f, textPaint) + } + + textPaint.apply { + setARGB(128, 0, 0, 0) + textAlign = Paint.Align.RIGHT + textSize = 26f + typeface = Typeface.create(Typeface.DEFAULT, Typeface.ITALIC) + } + + val footerTextPaintCenter = ((textPaint.descent() + textPaint.ascent()) / 2).roundToInt() + canvas.drawText("Wygenerowano w aplikacji Szkolny.eu", imageWidth - 10f, imageHeight - footerTextPaintCenter - 10f, textPaint) + + textPaint.apply { + setARGB(255, 127, 127, 127) + textAlign = Paint.Align.CENTER + textSize = 16f + typeface = Typeface.create(Typeface.DEFAULT, Typeface.NORMAL) + } + + val textPaintCenter = ((textPaint.descent() + textPaint.ascent()) / 2).roundToInt() + + val linePaint = Paint().apply { + setARGB(255, 100, 100, 100) + style = Paint.Style.STROKE + pathEffect = DashPathEffect(floatArrayOf(10f, 10f), 0f) + isAntiAlias = true + isFilterBitmap = true + isDither = true + } + + val minTimeInt = ((minTime!!.value / 10000) * 60) + ((minTime!!.value / 100) % 100) + + lessonRanges.forEach { (startTime, endTime) -> + listOf(startTime, endTime).forEach { value -> + val hour = value / 10000 + val minute = (value / 100) % 100 + val time = Time(hour, minute, 0) + + val firstOffset = time.inMinutes - minTimeInt // offset in minutes + val top = (heightProfileName + HEIGHT_CONSTANT + firstOffset * HEIGHT_MINUTE).toFloat() + + canvas.drawText(time.stringHM, WIDTH_CONSTANT / 2f, top - textPaintCenter, textPaint) + canvas.drawLine(WIDTH_CONSTANT.toFloat(), top, imageWidth.toFloat(), top, linePaint) + } + } + + val today = Date.getToday().stringY_m_d + val now = Time.getNow().stringH_M_S + val filename = "plan_lekcji_${app.profile.name}_${today}_${now}.png" + val resolver: ContentResolver = activity.applicationContext.contentResolver + val values = ContentValues() + values.put(MediaStore.MediaColumns.MIME_TYPE, "image/png") + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + values.put(MediaStore.MediaColumns.DISPLAY_NAME, filename) + values.put(MediaStore.MediaColumns.RELATIVE_PATH, File(Environment.DIRECTORY_PICTURES, "Szkolny.eu").path) + } else { + val picturesDirectory = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), "Szkolny.eu") + picturesDirectory.mkdirs() + values.put(MediaStore.MediaColumns.DATA, File(picturesDirectory, filename).path) + } + + try { + val uri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values) ?: return@withContext null + resolver.openOutputStream(uri).use { + bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) + } + uri + } catch (e: Exception) { + Log.e("SAVE_IMAGE", e.message, e) + return@withContext null + } + + } + + progressDialog.dismiss() + MaterialAlertDialogBuilder(activity) + .setTitle(R.string.timetable_generate_success_title) + .setMessage(R.string.timetable_generate_success_text) + .setPositiveButton(R.string.share) { dialog, _ -> + dialog.dismiss() + + val intent = Intent(Intent.ACTION_SEND) + intent.setDataAndType(null, "image/*") + intent.putExtra(Intent.EXTRA_STREAM, uri) + activity.startActivity(Intent.createChooser(intent, activity.getString(R.string.share_intent))) + } + .setNegativeButton(R.string.open) { dialog, _ -> + dialog.dismiss() + + val intent = Intent(Intent.ACTION_VIEW) + intent.setDataAndType(uri, "image/*") + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + activity.startActivity(intent) + } + .setNeutralButton(R.string.do_nothing) { dialog, _ -> dialog.dismiss() } + .show() + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt index a5d645bd..2df41c36 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/LessonDetailsDialog.kt @@ -8,61 +8,101 @@ import android.content.Intent import android.view.View import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.isVisible +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.mikepenz.iconics.IconicsDrawable +import com.mikepenz.iconics.utils.colorInt +import com.mikepenz.iconics.utils.sizeDp +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson -import pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull +import pl.szczodrzynski.edziennik.data.db.entity.Lesson +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.data.db.full.LessonFull import pl.szczodrzynski.edziennik.databinding.DialogLessonDetailsBinding +import pl.szczodrzynski.edziennik.onClick import pl.szczodrzynski.edziennik.setText +import pl.szczodrzynski.edziennik.ui.dialogs.event.EventDetailsDialog +import pl.szczodrzynski.edziennik.ui.dialogs.event.EventListAdapter import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog -import pl.szczodrzynski.edziennik.ui.modules.timetable.v2.TimetableFragment +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceDetailsDialog +import pl.szczodrzynski.edziennik.ui.modules.timetable.TimetableFragment +import pl.szczodrzynski.edziennik.utils.BetterLink +import pl.szczodrzynski.edziennik.utils.SimpleDividerItemDecoration import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Week +import kotlin.coroutines.CoroutineContext class LessonDetailsDialog( val activity: AppCompatActivity, val lesson: LessonFull, + val attendance: AttendanceFull? = null, val onShowListener: ((tag: String) -> Unit)? = null, val onDismissListener: ((tag: String) -> Unit)? = null -) { +) : CoroutineScope { companion object { private const val TAG = "LessonDetailsDialog" } + private lateinit var app: App private lateinit var b: DialogLessonDetailsBinding private lateinit var dialog: AlertDialog + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + private lateinit var adapter: EventListAdapter + private val manager + get() = app.timetableManager + private val attendanceManager + get() = app.attendanceManager + init { run { if (activity.isFinishing) return@run onShowListener?.invoke(TAG) + app = activity.applicationContext as App b = DialogLessonDetailsBinding.inflate(activity.layoutInflater) dialog = MaterialAlertDialogBuilder(activity) .setView(b.root) .setPositiveButton(R.string.close) { dialog, _ -> dialog.dismiss() } - .setNeutralButton(R.string.add) { _, _ -> - EventManualDialog( - activity, - lesson.profileId, - lesson, - onShowListener = onShowListener, - onDismissListener = onDismissListener - ) - } + .setNeutralButton(R.string.add, null) .setOnDismissListener { onDismissListener?.invoke(TAG) } .show() + + dialog.getButton(AlertDialog.BUTTON_NEUTRAL)?.onClick { + EventManualDialog( + activity, + lesson.profileId, + defaultLesson = lesson, + onShowListener = onShowListener, + onDismissListener = onDismissListener + ) + } + + if (App.devMode) + b.lessonId.visibility = View.VISIBLE + update() }} private fun update() { b.lesson = lesson val lessonDate = lesson.displayDate ?: return + val lessonTime = lesson.displayStartTime ?: return b.lessonDate.text = Week.getFullDayName(lessonDate.weekDay) + ", " + lessonDate.formattedString + b.annotationVisible = manager.getAnnotation(activity, lesson, b.annotation) + if (lesson.type >= Lesson.TYPE_SHIFTED_SOURCE) { b.shiftedLayout.visibility = View.VISIBLE var otherLessonDate: Date? = null @@ -138,5 +178,89 @@ class LessonDetailsDialog( if (lesson.type != Lesson.TYPE_CANCELLED && lesson.displayTeamId != null) { b.teamName = lesson.teamName } + + b.attendanceDivider.isVisible = attendance != null + b.attendanceLayout.isVisible = attendance != null + if (attendance != null) { + b.attendanceView.setAttendance(attendance, app.attendanceManager, bigView = true) + b.attendanceType.text = attendance.typeName + b.attendanceIcon.isVisible = attendance.let { + val icon = attendanceManager.getAttendanceIcon(it) ?: return@let false + val color = attendanceManager.getAttendanceColor(it) + b.attendanceIcon.setImageDrawable( + IconicsDrawable(activity, icon).apply { + colorInt = color + sizeDp = 24 + } + ) + true + } + b.attendanceDetails.onClick { + AttendanceDetailsDialog(activity, attendance, onShowListener, onDismissListener) + } + } + + adapter = EventListAdapter( + activity, + showWeekDay = false, + showDate = false, + showType = true, + showTime = true, + showSubject = true, + markAsSeen = true, + onItemClick = { + EventDetailsDialog( + activity, + it, + onShowListener = onShowListener, + onDismissListener = onDismissListener + ) + }, + onEventEditClick = { + EventManualDialog( + activity, + it.profileId, + editingEvent = it, + onShowListener = onShowListener, + onDismissListener = onDismissListener + ) + } + ) + + app.db.eventDao().getAllByDateTime(lesson.profileId, lessonDate, lessonTime).observe(activity, Observer { events -> + adapter.items = events + if (b.eventsView.adapter == null) { + b.eventsView.adapter = adapter + b.eventsView.apply { + isNestedScrollingEnabled = false + setHasFixedSize(true) + layoutManager = LinearLayoutManager(context) + addItemDecoration(SimpleDividerItemDecoration(context)) + } + } + adapter.notifyDataSetChanged() + + if (events != null && events.isNotEmpty()) { + b.eventsView.visibility = View.VISIBLE + b.eventsNoData.visibility = View.GONE + } else { + b.eventsView.visibility = View.GONE + b.eventsNoData.visibility = View.VISIBLE + } + }) + + lesson.displayTeacherName?.let { name -> + lesson.displayTeacherId ?: return@let + BetterLink.attach( + b.teacherNameView, + teachers = mapOf(lesson.displayTeacherId!! to name), + onActionSelected = dialog::dismiss + ) + BetterLink.attach( + b.oldTeacherNameView, + teachers = mapOf(lesson.displayTeacherId!! to name), + onActionSelected = dialog::dismiss + ) + } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java deleted file mode 100644 index 9b1b0339..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.java +++ /dev/null @@ -1,472 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.modules.agenda; - -import android.app.Activity; -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.os.AsyncTask; -import android.os.Bundle; -import android.os.Handler; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Toast; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.databinding.DataBindingUtil; -import androidx.fragment.app.Fragment; - -import com.applandeo.materialcalendarview.CalendarView; -import com.applandeo.materialcalendarview.EventDay; -import com.github.tibolte.agendacalendarview.AgendaCalendarView; -import com.github.tibolte.agendacalendarview.CalendarPickerController; -import com.github.tibolte.agendacalendarview.models.BaseCalendarEvent; -import com.github.tibolte.agendacalendarview.models.CalendarEvent; -import com.github.tibolte.agendacalendarview.models.IDayItem; -import com.mikepenz.iconics.IconicsColor; -import com.mikepenz.iconics.IconicsDrawable; -import com.mikepenz.iconics.IconicsSize; -import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial; -import com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Locale; - -import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.MainActivity; -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull; -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceFull; -import pl.szczodrzynski.edziennik.databinding.FragmentAgendaCalendarBinding; -import pl.szczodrzynski.edziennik.databinding.FragmentAgendaDefaultBinding; -import pl.szczodrzynski.edziennik.ui.dialogs.day.DayDialog; -import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog; -import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog; -import pl.szczodrzynski.edziennik.ui.dialogs.teacherabsence.TeacherAbsenceDialog; -import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchange.LessonChangeCounter; -import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchange.LessonChangeEvent; -import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchange.LessonChangeEventRenderer; -import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceCounter; -import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEvent; -import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEventRenderer; -import pl.szczodrzynski.edziennik.utils.Colors; -import pl.szczodrzynski.edziennik.utils.Themes; -import pl.szczodrzynski.edziennik.utils.Utils; -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem; -import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem; - -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_EVENT; -import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.AGENDA_CALENDAR; -import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.AGENDA_DEFAULT; -import static pl.szczodrzynski.edziennik.utils.Utils.intToStr; - -public class AgendaFragment extends Fragment { - - private App app = null; - private MainActivity activity = null; - private FragmentAgendaDefaultBinding b_default = null; - private FragmentAgendaCalendarBinding b_calendar = null; - private int viewType = AGENDA_DEFAULT; - private Date actualDate = null; - - @Override - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - activity = (MainActivity) getActivity(); - if (getActivity() == null || getContext() == null) - return null; - app = (App) activity.getApplication(); - getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true); - if (app.profile == null) - return inflater.inflate(R.layout.fragment_loading, container, false); - // activity, context and profile is valid - viewType = app.config.getUi().getAgendaViewType(); - if (viewType == AGENDA_DEFAULT) { - b_default = DataBindingUtil.inflate(inflater, R.layout.fragment_agenda_default, container, false); - return b_default.getRoot(); - } - else { - b_calendar = DataBindingUtil.inflate(inflater, R.layout.fragment_agenda_calendar, container, false); - return b_calendar.getRoot(); - } - } - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - if (app == null || app.profile == null || activity == null || (b_default == null && b_calendar == null) || !isAdded()) - return; - - activity.getBottomSheet().prependItems( - new BottomSheetPrimaryItem(true) - .withTitle(R.string.menu_add_event) - .withDescription(R.string.menu_add_event_desc) - .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline) - .withOnClickListener(v3 -> { - activity.getBottomSheet().close(); - new EventManualDialog( - activity, - App.profileId, - null, - actualDate, - null, - null, - null, - null, - null - ); - }), - new BottomSheetPrimaryItem(true) - .withTitle(R.string.menu_agenda_change_view) - .withIcon(viewType == AGENDA_DEFAULT ? CommunityMaterial.Icon.cmd_calendar_outline : CommunityMaterial.Icon.cmd_format_list_bulleted_square) - .withOnClickListener(v3 -> { - activity.getBottomSheet().close(); - viewType = viewType == AGENDA_DEFAULT ? AGENDA_CALENDAR : AGENDA_DEFAULT; - app.config.getUi().setAgendaViewType(viewType); - activity.reloadTarget(); - }), - new BottomSheetSeparatorItem(true), - new BottomSheetPrimaryItem(true) - .withTitle(R.string.menu_mark_as_read) - .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) - .withOnClickListener(v3 -> { - activity.getBottomSheet().close(); - AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_EVENT, true)); - Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show(); - }) - ); - - activity.getNavView().bottomBar.setFabEnable(true); - activity.getNavView().bottomBar.setFabExtendedText(getString(R.string.add)); - activity.getNavView().bottomBar.setFabIcon(CommunityMaterial.Icon2.cmd_plus); - activity.getNavView().setFabOnClickListener(v -> new EventManualDialog( - activity, - App.profileId, - null, - actualDate, - null, - null, - null, - null, - null - )); - - activity.gainAttention(); - activity.gainAttentionFAB(); - - if (viewType == AGENDA_DEFAULT) { - createDefaultAgendaView(); - } - else { - createCalendarAgendaView(); - } - } - - private void createDefaultAgendaView() { - List unreadEventDates = new ArrayList<>(); - - final Handler handler = new Handler(); - handler.postDelayed(() -> AsyncTask.execute(() -> { - if (app == null || app.profile == null || activity == null || b_default == null || !isAdded()) - return; - - List eventList = new ArrayList<>(); - - List lessonChangeCounters = app.db.lessonChangeDao().getLessonChangeCountersNow(App.profileId); - for (LessonChangeCounter counter : lessonChangeCounters) { - Calendar startTime = Calendar.getInstance(); - Calendar endTime = Calendar.getInstance(); - if (counter.lessonChangeDate == null) { - continue; - } - startTime.set(counter.lessonChangeDate.year, counter.lessonChangeDate.month - 1, counter.lessonChangeDate.day, 10, 0, 0); - endTime.setTimeInMillis(startTime.getTimeInMillis() + (1000 * 60 * 45)); - eventList.add(new LessonChangeEvent( - counter.lessonChangeDate.getInMillis(), - 0xff78909c, - Colors.legibleTextColor(0xff78909c), - startTime, - endTime, - counter.profileId, - counter.lessonChangeDate, - counter.lessonChangeCount - )); - } - - if (app.profile.getStudentData("showTeacherAbsences", true)) { - List teacherAbsenceList = app.db.teacherAbsenceDao().getAllFullNow(App.profileId); - List teacherAbsenceCounters = new ArrayList<>(); - - for (TeacherAbsenceFull absence : teacherAbsenceList) { - for (Date date = absence.getDateFrom().clone(); date.compareTo(absence.getDateTo()) < 1; date.stepForward(0, 0, 1)) { - boolean counterFound = false; - for (TeacherAbsenceCounter counter : teacherAbsenceCounters) { - if (counter.getTeacherAbsenceDate().compareTo(date) == 0) { - counter.setTeacherAbsenceCount(counter.getTeacherAbsenceCount() + 1); - counterFound = true; - break; - } - } - - if (!counterFound) { - teacherAbsenceCounters.add(new TeacherAbsenceCounter(date.clone(), 1)); - } - } - } - - for (TeacherAbsenceCounter counter : teacherAbsenceCounters) { - Calendar startTime = Calendar.getInstance(); - Calendar endTime = Calendar.getInstance(); - Date date = counter.getTeacherAbsenceDate(); - startTime.set(date.year, date.month - 1, date.day, 10, 0, 0); - endTime.setTimeInMillis(startTime.getTimeInMillis() + (1000 * 60 * 45)); - eventList.add(new TeacherAbsenceEvent( - date.getInMillis(), - 0xffff1744, - Colors.legibleTextColor(0xffff1744), - startTime, - endTime, - App.profileId, - date, - counter.getTeacherAbsenceCount() - )); - } - } - - - List events = app.db.eventDao().getAllNow(App.profileId); - for (EventFull event : events) { - Calendar startTime = Calendar.getInstance(); - Calendar endTime = Calendar.getInstance(); - if (event.eventDate == null) - continue; - startTime.set( - event.eventDate.year, - event.eventDate.month - 1, - event.eventDate.day, - event.startTime == null ? 0 : event.startTime.hour, - event.startTime == null ? 0 : event.startTime.minute, - event.startTime == null ? 0 : event.startTime.second - ); - endTime.setTimeInMillis(startTime.getTimeInMillis() + (1000 * 60 * 45)); - eventList.add(new BaseCalendarEvent(event.typeName + " - " + event.topic, - "", - (event.startTime == null ? getString(R.string.agenda_event_all_day) : event.startTime.getStringHM()) + - Utils.bs(", ", event.subjectLongName) + - Utils.bs(", ", event.teacherFullName) + - Utils.bs(", ", event.teamName), - event.getColor(), - Colors.legibleTextColor(event.getColor()), - startTime, - endTime, - event.startTime == null, - event.id, !event.seen)); - if (!event.seen) { - unreadEventDates.add(event.eventDate.getValue()); - } - } - - /*List lessonChanges = app.db.lessonChangeDao().getAllChangesWithLessonsNow(App.profileId); - for (LessonFull lesson: lessonChanges) { - Calendar startTime = Calendar.getInstance(); - Calendar endTime = Calendar.getInstance(); - if (lesson.lessonDate == null) { - continue; - } - startTime.set(lesson.lessonDate.year, lesson.lessonDate.month - 1, lesson.lessonDate.day, lesson.startTime.hour, lesson.startTime.minute, lesson.startTime.second); - endTime.setTimeInMillis(startTime.getTimeInMillis() + (1000 * 60 * 45)); - String description = lesson.changeTypeStr(activity); - if (lesson.changeType != TYPE_CANCELLED) { - if (lesson.subjectId != lesson.changeSubjectId && lesson.teacherId != lesson.changeTeacherId) { - description += " -> " + bs(null, lesson.changeSubjectLongName, ", ") + bs(lesson.changeTeacherFullName); - } else if (lesson.subjectId != lesson.changeSubjectId) { - description += " -> " + bs(lesson.changeSubjectLongName); - } else if (lesson.teacherId != lesson.changeTeacherId) { - description += " -> " + bs(lesson.changeTeacherFullName); - } - } - eventList.add(new BaseCalendarEvent(description, - "", - (lesson.startTime.getStringHM()) + - Utils.bs(", ", lesson.subjectLongName) + - Utils.bs(", ", lesson.teacherFullName) + - Utils.bs(", ", lesson.teamName), - 0xff78909c, - Colors.legibleTextColor(0xff78909c), - startTime, - endTime, - false, - (int)lesson.changeId, false)); - }*/ - - activity.runOnUiThread(() -> { - AgendaCalendarView mAgendaCalendarView = b_default.agendaDefaultView; - // minimum and maximum date of our calendar - // 2 month behind, one year ahead, example: March 2015 <-> May 2015 <-> May 2016 - Calendar minDate = Calendar.getInstance(); - Calendar maxDate = Calendar.getInstance(); - - minDate.add(Calendar.MONTH, -2); - minDate.set(Calendar.DAY_OF_MONTH, 1); - maxDate.add(Calendar.MONTH, 2); - - - mAgendaCalendarView.init(eventList, minDate, maxDate, Locale.getDefault(), new CalendarPickerController() { - @Override - public void onDaySelected(IDayItem dayItem) { - } - - @Override - public void onScrollToDate(Calendar calendar) { - actualDate = Date.fromCalendar(calendar); - int scrolledDate = actualDate.getValue(); - if (unreadEventDates.contains(scrolledDate)) { - AsyncTask.execute(() -> app.db.eventDao().setSeenByDate(App.profileId, Date.fromYmd(intToStr(scrolledDate)), true)); - unreadEventDates.remove((Integer) scrolledDate); - } - } - - @Override - public void onEventSelected(CalendarEvent calendarEvent) { - if (calendarEvent instanceof BaseCalendarEvent) { - /*if (!calendarEvent.isPlaceholder() && !calendarEvent.isAllDay()) { - // new EventListDialogOld(activity).show(app, Date.fromCalendar(calendarEvent.getInstanceDay()), Time.fromMillis(calendarEvent.getStartTime().getTimeInMillis()), true); - new EventListDialog( - activity, - App.profileId, - Date.fromCalendar(calendarEvent.getInstanceDay()), - Time.fromMillis(calendarEvent.getStartTime().getTimeInMillis()), - null, - null); - } else {*/ - // new EventListDialogOld(activity).show(app, Date.fromCalendar(calendarEvent.getInstanceDay())); - new DayDialog( - activity, - App.profileId, - Date.fromCalendar(calendarEvent.getInstanceDay()), - null, - null - ); - /*new EventListDialog( - activity, - App.profileId, - Date.fromCalendar(calendarEvent.getInstanceDay()), - null, - null, - null);*/ - //} - } else if (calendarEvent instanceof LessonChangeEvent) { - new LessonChangeDialog(activity).show(app, Date.fromCalendar(calendarEvent.getInstanceDay())); - //Toast.makeText(app, "Clicked "+((LessonChangeEvent) calendarEvent).getLessonChangeDate().getFormattedString(), Toast.LENGTH_SHORT).show(); - } else if (calendarEvent instanceof TeacherAbsenceEvent) { - new TeacherAbsenceDialog(activity).show(app, Date.fromCalendar(calendarEvent.getInstanceDay())); - } - } - }, new LessonChangeEventRenderer(), new TeacherAbsenceEventRenderer()); - b_default.progressBar.setVisibility(View.GONE); - }); - }), 500); - } - - private void createCalendarAgendaView() { - List unreadEventDates = new ArrayList<>(); - - final Handler handler = new Handler(); - handler.postDelayed(() -> AsyncTask.execute(() -> { - if (app == null || app.profile == null || activity == null || b_calendar == null || !isAdded()) - return; - Context c = getContext(); - Activity a = getActivity(); - assert c != null; - assert a != null; - if (!isAdded()) { - return; - } - - List eventList = new ArrayList<>(); - - List events = app.db.eventDao().getAllNow(App.profileId); - for (EventFull event : events) { - if (event.eventDate == null) - continue; - Calendar startTime = Calendar.getInstance(); - startTime.set( - event.eventDate.year, - event.eventDate.month - 1, - event.eventDate.day, - event.startTime == null ? 0 : event.startTime.hour, - event.startTime == null ? 0 : event.startTime.minute, - event.startTime == null ? 0 : event.startTime.second - ); - Drawable eventIcon = new IconicsDrawable(activity).icon(CommunityMaterial.Icon.cmd_checkbox_blank_circle).size(IconicsSize.dp(10)).color(IconicsColor.colorInt(event.getColor())); - eventList.add(new EventDay(startTime, eventIcon)); - if (!event.seen) { - unreadEventDates.add(event.eventDate.getValue()); - } - } - - List lessonChanges = app.db.lessonChangeDao().getAllChangesWithLessonsNow(App.profileId); - - for (LessonFull lesson: lessonChanges) { - Calendar startTime = Calendar.getInstance(); - if (lesson.lessonDate == null) { - continue; - } - startTime.set( - lesson.lessonDate.year, - lesson.lessonDate.month - 1, - lesson.lessonDate.day, - lesson.startTime.hour, - lesson.startTime.minute, - lesson.startTime.second); - Drawable eventIcon = new IconicsDrawable(activity).icon(CommunityMaterial.Icon.cmd_checkbox_blank_circle).size(IconicsSize.dp(10)).color(IconicsColor.colorInt(0xff78909c)); - eventList.add(new EventDay(startTime, eventIcon)); - } - - getActivity().runOnUiThread(() -> { - //List eventList = new ArrayList<>(); - - //Collections.sort(eventList, new EventListComparator()); - - CalendarView calendarView = b_calendar.agendaCalendarView; - calendarView.setEvents(eventList); - calendarView.setOnDayClickListener(eventDay -> { - Date dayDate = Date.fromCalendar(eventDay.getCalendar()); - int scrolledDate = dayDate.getValue(); - if (unreadEventDates.contains(scrolledDate)) { - AsyncTask.execute(() -> app.db.eventDao().setSeenByDate(App.profileId, Date.fromYmd(intToStr(scrolledDate)), true)); - unreadEventDates.remove((Integer) scrolledDate); - } - - new DayDialog( - activity, - App.profileId, - dayDate, - null, - null - ); - // new EventListDialogOld(getContext()).show(app, dayDate); - /*new EventListDialog( - activity, - App.profileId, - dayDate, - null, - null, - null - );*/ - }); - b_calendar.progressBar.setVisibility(View.GONE); - }); - }), 300); - } - - public static class EventListComparator implements java.util.Comparator { - @Override - public int compare(CalendarEvent o1, CalendarEvent o2) { - return Long.compare(o1.getStartTime().getTimeInMillis(), o2.getStartTime().getTimeInMillis()); - //return (int)(o1.getStartTime().getTimeInMillis() - o2.getStartTime().getTimeInMillis()); - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt new file mode 100644 index 00000000..8607217a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragment.kt @@ -0,0 +1,197 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.ui.modules.agenda + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Toast +import androidx.databinding.ViewDataBinding +import androidx.fragment.app.Fragment +import com.applandeo.materialcalendarview.EventDay +import com.mikepenz.iconics.IconicsDrawable +import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial +import com.mikepenz.iconics.utils.colorInt +import com.mikepenz.iconics.utils.sizeDp +import eu.szkolny.font.SzkolnyFont +import kotlinx.coroutines.* +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.entity.EventType +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.databinding.FragmentAgendaCalendarBinding +import pl.szczodrzynski.edziennik.databinding.FragmentAgendaDefaultBinding +import pl.szczodrzynski.edziennik.ui.dialogs.agenda.AgendaConfigDialog +import pl.szczodrzynski.edziennik.ui.dialogs.day.DayDialog +import pl.szczodrzynski.edziennik.ui.dialogs.event.EventManualDialog +import pl.szczodrzynski.edziennik.utils.Themes +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem +import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem +import java.util.* +import kotlin.coroutines.CoroutineContext + +class AgendaFragment : Fragment(), CoroutineScope { + + private lateinit var activity: MainActivity + private lateinit var b: ViewDataBinding + + private val app by lazy { activity.app } + + private var job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + private var type: Int = Profile.AGENDA_DEFAULT + + private var agendaDefault: AgendaFragmentDefault? = null + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + if (getActivity() == null || context == null) return null + activity = getActivity() as MainActivity + context?.theme?.applyStyle(Themes.appTheme, true) + type = app.config.forProfile().ui.agendaViewType + b = when (type) { + Profile.AGENDA_DEFAULT -> FragmentAgendaDefaultBinding.inflate(inflater, container, false) + Profile.AGENDA_CALENDAR -> FragmentAgendaCalendarBinding.inflate(inflater, container, false) + else -> return null + } + return b.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + if (!isAdded) return + + activity.bottomSheet.prependItems( + BottomSheetPrimaryItem(true) + .withTitle(R.string.menu_add_event) + .withDescription(R.string.menu_add_event_desc) + .withIcon(SzkolnyFont.Icon.szf_calendar_plus_outline) + .withOnClickListener { + activity.bottomSheet.close() + EventManualDialog( + activity, + app.profileId, + defaultDate = AgendaFragmentDefault.selectedDate + ) + }, + BottomSheetPrimaryItem(true) + .withTitle(R.string.menu_agenda_config) + .withIcon(CommunityMaterial.Icon.cmd_cog_outline) + .withOnClickListener { + activity.bottomSheet.close() + AgendaConfigDialog(activity, true, null, null) + }, + BottomSheetPrimaryItem(true) + .withTitle(R.string.menu_agenda_change_view) + .withIcon(if (type == Profile.AGENDA_DEFAULT) CommunityMaterial.Icon.cmd_calendar_outline else CommunityMaterial.Icon2.cmd_format_list_bulleted_square) + .withOnClickListener { + activity.bottomSheet.close() + type = + if (type == Profile.AGENDA_DEFAULT) Profile.AGENDA_CALENDAR else Profile.AGENDA_DEFAULT + app.config.forProfile().ui.agendaViewType = type + activity.reloadTarget() + }, + BottomSheetSeparatorItem(true), + BottomSheetPrimaryItem(true) + .withTitle(R.string.menu_mark_as_read) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) + .withOnClickListener { + launch { + activity.bottomSheet.close() + withContext(Dispatchers.Default) { + App.db.metadataDao() + .setAllSeen(app.profileId, Metadata.TYPE_EVENT, true) + } + Toast.makeText( + activity, + R.string.main_menu_mark_as_read_success, + Toast.LENGTH_SHORT + ).show() + } + } + ) + + activity.navView.bottomBar.fabEnable = true + activity.navView.bottomBar.fabExtendedText = getString(R.string.add) + activity.navView.bottomBar.fabIcon = CommunityMaterial.Icon3.cmd_plus + activity.navView.setFabOnClickListener { + EventManualDialog( + activity, + app.profileId, + defaultDate = AgendaFragmentDefault.selectedDate + ) + } + + activity.gainAttention() + activity.gainAttentionFAB() + + when (type) { + Profile.AGENDA_DEFAULT -> createDefaultAgendaView() + Profile.AGENDA_CALENDAR -> createCalendarAgendaView() + } + } + + private suspend fun checkEventTypes() { + withContext(Dispatchers.Default) { + val eventTypes = app.db.eventTypeDao().getAllNow(app.profileId).map { + it.id + } + val defaultEventTypes = EventType.getTypeColorMap().keys + if (!eventTypes.containsAll(defaultEventTypes)) { + app.db.eventTypeDao().addDefaultTypes(activity, app.profileId) + } + } + } + + private fun createDefaultAgendaView() { (b as? FragmentAgendaDefaultBinding)?.let { b -> launch { + if (!isAdded) + return@launch + checkEventTypes() + delay(500) + + agendaDefault = AgendaFragmentDefault(activity, app, b) + agendaDefault?.initView(this@AgendaFragment) + }}} + + private fun createCalendarAgendaView() { (b as? FragmentAgendaCalendarBinding)?.let { b -> launch { + checkEventTypes() + delay(300) + + val dayList = mutableListOf() + + val events = withContext(Dispatchers.Default) { app.db.eventDao().getAllNow(app.profileId) } + val unreadEventDates = mutableSetOf() + + events.forEach { event -> + val eventIcon = IconicsDrawable(activity).apply { + icon = CommunityMaterial.Icon.cmd_checkbox_blank_circle + sizeDp = 10 + colorInt = event.eventColor + } + + dayList.add(EventDay(event.startTimeCalendar, eventIcon)) + + if (!event.seen) unreadEventDates.add(event.date.value) + } + + b.agendaCalendarView.setEvents(dayList) + b.agendaCalendarView.setOnDayClickListener { day -> this@AgendaFragment.launch { + val date = Date.fromCalendar(day.calendar) + + if (date.value in unreadEventDates) { + withContext(Dispatchers.Default) { app.db.eventDao().setSeenByDate(app.profileId, date, true) } + unreadEventDates.remove(date.value) + } + + DayDialog(activity, app.profileId, date) + }} + + b.progressBar.visibility = View.GONE + }}} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragmentDefault.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragmentDefault.kt new file mode 100644 index 00000000..9167fb9a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/AgendaFragmentDefault.kt @@ -0,0 +1,310 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-8. + */ + +package pl.szczodrzynski.edziennik.ui.modules.agenda + +import android.util.SparseIntArray +import android.widget.AbsListView +import android.widget.AbsListView.OnScrollListener +import androidx.core.util.forEach +import androidx.core.util.set +import androidx.core.view.isVisible +import com.github.tibolte.agendacalendarview.CalendarManager +import com.github.tibolte.agendacalendarview.CalendarPickerController +import com.github.tibolte.agendacalendarview.agenda.AgendaAdapter +import com.github.tibolte.agendacalendarview.models.BaseCalendarEvent +import com.github.tibolte.agendacalendarview.models.CalendarEvent +import com.github.tibolte.agendacalendarview.models.IDayItem +import kotlinx.coroutines.* +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.databinding.FragmentAgendaDefaultBinding +import pl.szczodrzynski.edziennik.ui.dialogs.day.DayDialog +import pl.szczodrzynski.edziennik.ui.dialogs.event.EventDetailsDialog +import pl.szczodrzynski.edziennik.ui.dialogs.lessonchange.LessonChangeDialog +import pl.szczodrzynski.edziennik.ui.dialogs.teacherabsence.TeacherAbsenceDialog +import pl.szczodrzynski.edziennik.ui.modules.agenda.event.AgendaEvent +import pl.szczodrzynski.edziennik.ui.modules.agenda.event.AgendaEventGroup +import pl.szczodrzynski.edziennik.ui.modules.agenda.event.AgendaEventGroupRenderer +import pl.szczodrzynski.edziennik.ui.modules.agenda.event.AgendaEventRenderer +import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges.LessonChangesEvent +import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges.LessonChangesEventRenderer +import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEvent +import pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence.TeacherAbsenceEventRenderer +import pl.szczodrzynski.edziennik.utils.models.Date +import java.util.* + +class AgendaFragmentDefault( + private val activity: MainActivity, + private val app: App, + private val b: FragmentAgendaDefaultBinding +) : OnScrollListener, CoroutineScope { + companion object { + var selectedDate: Date = Date.getToday() + } + + override val coroutineContext = Job() + Dispatchers.Main + + private val unreadDates = mutableSetOf() + private val events = mutableListOf() + private var isInitialized = false + private val profileConfig by lazy { app.config.forProfile().ui } + + private val listView + get() = b.agendaDefaultView.agendaView.agendaListView + private val adapter + get() = listView.adapter as? AgendaAdapter + private val manager + get() = CalendarManager.getInstance() + + private var scrollState = OnScrollListener.SCROLL_STATE_IDLE + private var updatePending = false + private var notifyPending = false + override fun onScrollStateChanged(view: AbsListView?, newScrollState: Int) { + b.agendaDefaultView.agendaScrollListener.onScrollStateChanged(view, scrollState) + scrollState = newScrollState + if (updatePending) updateData() + if (notifyPending) notifyDataSetChanged() + } + + override fun onScroll( + view: AbsListView?, + firstVisibleItem: Int, + visibleItemCount: Int, + totalItemCount: Int + ) = b.agendaDefaultView.agendaScrollListener.onScroll( + view, + firstVisibleItem, + visibleItemCount, + totalItemCount + ) + + /** + * Mark the data as needing update, either after 1 second (when + * not scrolling) or 1 second after scrolling stops. + */ + private fun updateData() = launch { + if (scrollState == OnScrollListener.SCROLL_STATE_IDLE) { + updatePending = false + delay(1000) + notifyDataSetChanged() + } else updatePending = true + } + + /** + * Notify the adapter about changes, either instantly or after + * scrolling stops. + */ + private fun notifyDataSetChanged() { + if (scrollState == OnScrollListener.SCROLL_STATE_IDLE) { + notifyPending = false + adapter?.notifyDataSetChanged() + } else notifyPending = true + } + + suspend fun initView(fragment: AgendaFragment) { + isInitialized = false + + withContext(Dispatchers.Default) { + if (profileConfig.agendaLessonChanges) + addLessonChanges(events) + + if (profileConfig.agendaTeacherAbsence) + addTeacherAbsence(events) + } + + app.db.eventDao().getAll(app.profileId).observe(fragment) { + addEvents(events, it) + if (isInitialized) + updateView() + else + initViewPriv() + } + } + + private fun initViewPriv() { + val dateStart = app.profile.dateSemester1Start.asCalendar + val dateEnd = app.profile.dateYearEnd.asCalendar + + val isCompactMode = profileConfig.agendaCompactMode + + b.agendaDefaultView.init( + events, + dateStart, + dateEnd, + Locale.getDefault(), + object : CalendarPickerController { + override fun onDaySelected(dayItem: IDayItem) { + val c = Calendar.getInstance() + c.time = dayItem.date + if (c.timeInMillis == selectedDate.inMillis) { + DayDialog(activity, app.profileId, selectedDate) + } + } + + override fun onEventSelected(event: CalendarEvent) { + val date = Date.fromCalendar(event.instanceDay) + + when (event) { + is AgendaEvent -> EventDetailsDialog(activity, event.event) + is LessonChangesEvent -> LessonChangeDialog(activity, app.profileId, date) + is TeacherAbsenceEvent -> TeacherAbsenceDialog( + activity, + app.profileId, + date + ) + is AgendaEventGroup -> DayDialog(activity, app.profileId, date, eventTypeId = event.typeId) + is BaseCalendarEvent -> if (event.isPlaceHolder) + DayDialog(activity, app.profileId, date) + } + + if (event is BaseEvent && event.showItemBadge) { + val unreadCount = manager.events.count { + it.instanceDay.equals(event.instanceDay) && it.showBadge + } + // only clicked event is unread, remove the day badge + if (unreadCount == 1 && event.showBadge) { + event.dayReference.showBadge = false + unreadDates.remove(date.value) + } + setAsRead(event) + } + } + + override fun onScrollToDate(calendar: Calendar) { + selectedDate = Date.fromCalendar(calendar) + + // Mark as read scrolled date + if (selectedDate.value in unreadDates) { + setAsRead(calendar) + activity.launch(Dispatchers.Default) { + app.db.eventDao().setSeenByDate(app.profileId, selectedDate, true) + } + unreadDates.remove(selectedDate.value) + } + } + }, + AgendaEventRenderer(app.eventManager, isCompactMode), + AgendaEventGroupRenderer(), + LessonChangesEventRenderer(), + TeacherAbsenceEventRenderer() + ) + + listView.setOnScrollListener(this) + + isInitialized = true + b.progressBar.isVisible = false + } + + private fun updateView() { + manager.events.clear() + manager.loadEvents(events, BaseCalendarEvent()) + + adapter?.updateEvents(manager.events) + //listView.scrollToCurrentDate(selectedDate.asCalendar) + } + + private fun setAsRead(date: Calendar) { + // get all events matching the date + val events = manager.events.filter { + if (it.instanceDay.equals(date) && it.showBadge && it is AgendaEvent) { + // hide the day badge for the date + it.dayReference.showBadge = false + return@filter true + } + false + } + // set this date's events as read + setAsRead(*events.toTypedArray()) + } + + private fun setAsRead(vararg event: CalendarEvent) { + // hide per-event badges + for (e in event) { + events.firstOrNull { + it == e + }?.showBadge = false + e.showBadge = false + } + + listView.setOnScrollListener(this) + updateData() + } + + private fun addEvents( + events: MutableList, + eventList: List + ) { + events.removeAll { it is AgendaEvent || it is AgendaEventGroup } + + if (!profileConfig.agendaGroupByType) { + events += eventList.map { + if (!it.seen) + unreadDates.add(it.date.value) + AgendaEvent(it) + } + return + } + + eventList.groupBy { + it.date.value to it.type + }.forEach { (_, list) -> + val event = list.first() + if (list.size == 1) { + if (!event.seen) + unreadDates.add(event.date.value) + events += AgendaEvent(event) + } else { + events.add(0, AgendaEventGroup( + profileId = event.profileId, + date = event.date, + typeId = event.type, + typeName = event.typeName ?: "-", + typeColor = event.typeColor ?: event.eventColor, + count = list.size, + showBadge = list.any { !it.seen } + )) + } + } + } + + private fun addLessonChanges(events: MutableList) { + val lessons = app.db.timetableDao().getChangesNow(app.profileId) + + val grouped = lessons.groupBy { + it.displayDate + } + + events += grouped.mapNotNull { (date, changes) -> + LessonChangesEvent( + app.profileId, + date = date ?: return@mapNotNull null, + count = changes.size, + showBadge = changes.any { !it.seen } + ) + } + } + + private fun addTeacherAbsence(events: MutableList) { + val teacherAbsence = app.db.teacherAbsenceDao().getAllNow(app.profileId) + + val countMap = SparseIntArray() + + for (absence in teacherAbsence) { + while (absence.dateFrom <= absence.dateTo) { + countMap[absence.dateFrom.value] += 1 + absence.dateFrom.stepForward(0, 0, 1) + } + } + + countMap.forEach { dateInt, count -> + events += TeacherAbsenceEvent( + app.profileId, + date = Date.fromValue(dateInt), + count = count + ) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/BaseEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/BaseEvent.kt new file mode 100644 index 00000000..62569504 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/BaseEvent.kt @@ -0,0 +1,66 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-9. + */ + +package pl.szczodrzynski.edziennik.ui.modules.agenda + +import com.github.tibolte.agendacalendarview.models.CalendarEvent +import com.github.tibolte.agendacalendarview.models.IDayItem +import com.github.tibolte.agendacalendarview.models.IWeekItem +import java.util.* + +open class BaseEvent( + private val id: Long, + private val time: Calendar, + private val color: Int, + private var showBadge: Boolean, + var showItemBadge: Boolean = showBadge +) : CalendarEvent { + + override fun copy() = BaseEvent(id, time, color, showBadge) + + private lateinit var date: Calendar + override fun getInstanceDay() = date + override fun setInstanceDay(value: Calendar) { + date = value + } + + private lateinit var dayReference: IDayItem + override fun getDayReference() = dayReference + override fun setDayReference(value: IDayItem) { + dayReference = value + } + + private lateinit var weekReference: IWeekItem + override fun getWeekReference() = weekReference + override fun setWeekReference(value: IWeekItem) { + weekReference = value + } + + override fun getShowBadge() = showBadge + override fun setShowBadge(value: Boolean) { + showBadge = value + showItemBadge = value + } + + override fun getId() = id + override fun getStartTime() = time + override fun getEndTime() = time + override fun getTitle() = "" + override fun getDescription() = "" + override fun getLocation() = "" + override fun getColor() = color + override fun getTextColor() = 0 + override fun isPlaceholder() = false + override fun isAllDay() = false + + override fun setId(value: Long) = Unit + override fun setStartTime(value: Calendar) = Unit + override fun setEndTime(value: Calendar) = Unit + override fun setTitle(value: String) = Unit + override fun setDescription(value: String) = Unit + override fun setLocation(value: String) = Unit + override fun setTextColor(value: Int) = Unit + override fun setPlaceholder(value: Boolean) = Unit + override fun setAllDay(value: Boolean) = Unit +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEvent.kt new file mode 100644 index 00000000..e6ba6e23 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEvent.kt @@ -0,0 +1,20 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-8. + */ + +package pl.szczodrzynski.edziennik.ui.modules.agenda.event + +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.ui.modules.agenda.BaseEvent + +class AgendaEvent( + val event: EventFull, + showBadge: Boolean = !event.seen +) : BaseEvent( + id = event.id, + time = event.startTimeCalendar, + color = event.eventColor, + showBadge = showBadge +) { + override fun copy() = AgendaEvent(event, showBadge) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroup.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroup.kt new file mode 100644 index 00000000..3ef4eb47 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroup.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-10. + */ + +package pl.szczodrzynski.edziennik.ui.modules.agenda.event + +import pl.szczodrzynski.edziennik.ui.modules.agenda.BaseEvent +import pl.szczodrzynski.edziennik.utils.models.Date + +class AgendaEventGroup( + val profileId: Int, + val date: Date, + val typeId: Long, + val typeName: String, + val typeColor: Int, + val count: Int, + showBadge: Boolean +) : BaseEvent( + id = date.value.toLong(), + time = date.asCalendar, + color = typeColor, + showBadge = showBadge +) { + override fun copy() = AgendaEventGroup(profileId, date, typeId, typeName, typeColor, count, showBadge) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroupRenderer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroupRenderer.kt new file mode 100644 index 00000000..2a1f9af8 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventGroupRenderer.kt @@ -0,0 +1,33 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-10. + */ + +package pl.szczodrzynski.edziennik.ui.modules.agenda.event + +import android.view.View +import androidx.core.view.isVisible +import com.github.tibolte.agendacalendarview.render.EventRenderer +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.databinding.AgendaWrappedGroupBinding +import pl.szczodrzynski.edziennik.resolveAttr +import pl.szczodrzynski.edziennik.setTintColor +import pl.szczodrzynski.edziennik.utils.Colors + +class AgendaEventGroupRenderer : EventRenderer() { + + override fun render(view: View, event: AgendaEventGroup) { + val b = AgendaWrappedGroupBinding.bind(view).item + + b.card.foreground.setTintColor(event.color) + b.card.background.setTintColor(event.color) + b.name.text = event.typeName + b.name.setTextColor(Colors.legibleTextColor(event.color)) + b.count.text = event.count.toString() + b.count.background.setTintColor(android.R.attr.colorBackground.resolveAttr(view.context)) + + b.badge.isVisible = event.showItemBadge + } + + override fun getEventLayout(): Int = R.layout.agenda_wrapped_group +} + diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventRenderer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventRenderer.kt new file mode 100644 index 00000000..2e857cd3 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/event/AgendaEventRenderer.kt @@ -0,0 +1,81 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-8. + */ + +package pl.szczodrzynski.edziennik.ui.modules.agenda.event + +import android.annotation.SuppressLint +import android.view.View +import android.widget.FrameLayout +import android.widget.TextView +import androidx.core.view.isVisible +import com.github.tibolte.agendacalendarview.render.EventRenderer +import com.mikepenz.iconics.view.IconicsTextView +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.databinding.AgendaWrappedEventBinding +import pl.szczodrzynski.edziennik.databinding.AgendaWrappedEventCompactBinding +import pl.szczodrzynski.edziennik.join +import pl.szczodrzynski.edziennik.resolveAttr +import pl.szczodrzynski.edziennik.setTintColor +import pl.szczodrzynski.edziennik.utils.Colors +import pl.szczodrzynski.edziennik.utils.managers.EventManager + +class AgendaEventRenderer( + val manager: EventManager, + val isCompact: Boolean +) : EventRenderer() { + + @SuppressLint("SetTextI18n") + override fun render(view: View, aEvent: AgendaEvent) { + if (isCompact) { + val b = AgendaWrappedEventCompactBinding.bind(view).item + bindView(aEvent, b.card, b.title, null, b.badgeBackground, b.badge) + } else { + val b = AgendaWrappedEventBinding.bind(view).item + bindView(aEvent, b.card, b.title, b.subtitle, b.badgeBackground, b.badge) + } + } + + private fun bindView( + aEvent: AgendaEvent, + card: FrameLayout, + title: IconicsTextView, + subtitle: TextView?, + badgeBackground: View, + badge: View + ) { + val event = aEvent.event + + val textColor = Colors.legibleTextColor(event.eventColor) + + val timeText = if (event.time == null) + card.context.getString(R.string.agenda_event_all_day) + else + event.time!!.stringHM + + val eventSubtitle = listOfNotNull( + timeText, + event.subjectLongName, + event.teacherName, + event.teamName + ).join(", ") + + card.foreground.setTintColor(event.eventColor) + card.background.setTintColor(event.eventColor) + manager.setEventTopic(title, event, doneIconColor = textColor) + title.setTextColor(textColor) + subtitle?.text = eventSubtitle + subtitle?.setTextColor(textColor) + + badgeBackground.isVisible = aEvent.showItemBadge + badgeBackground.background.setTintColor( + android.R.attr.colorBackground.resolveAttr(card.context) + ) + badge.isVisible = aEvent.showItemBadge + } + + override fun getEventLayout() = if (isCompact) + R.layout.agenda_wrapped_event_compact + else + R.layout.agenda_wrapped_event +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchange/LessonChangeCounter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchange/LessonChangeCounter.java deleted file mode 100644 index 6c2cfaf2..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchange/LessonChangeCounter.java +++ /dev/null @@ -1,9 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchange; - -import pl.szczodrzynski.edziennik.utils.models.Date; - -public class LessonChangeCounter { - public int profileId; - public Date lessonChangeDate; - public int lessonChangeCount; -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchange/LessonChangeEvent.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchange/LessonChangeEvent.java deleted file mode 100644 index 077c2206..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchange/LessonChangeEvent.java +++ /dev/null @@ -1,243 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchange; - -import com.github.tibolte.agendacalendarview.models.CalendarEvent; -import com.github.tibolte.agendacalendarview.models.IDayItem; -import com.github.tibolte.agendacalendarview.models.IWeekItem; - -import java.util.Calendar; - -import pl.szczodrzynski.edziennik.utils.models.Date; - -public class LessonChangeEvent implements CalendarEvent { - - /** - * Id of the event. - */ - private long mId; - /** - * Color to be displayed in the agenda view. - */ - private int mColor; - /** - * Text color displayed on the background color - */ - private int mTextColor; - /** - * Calendar instance helping sorting the events per section in the agenda view. - */ - private Calendar mInstanceDay; - /** - * Start time of the event. - */ - private Calendar mStartTime; - /** - * End time of the event. - */ - private Calendar mEndTime; - /** - * References to a DayItem instance for that event, used to link interaction between the - * calendar view and the agenda view. - */ - private IDayItem mDayReference; - /** - * References to a WeekItem instance for that event, used to link interaction between the - * calendar view and the agenda view. - */ - private IWeekItem mWeekReference; - - - private int profileId; - private Date lessonChangeDate; - private int lessonChangeCount; - - public LessonChangeEvent(LessonChangeEvent calendarEvent) { - this.mId = calendarEvent.getId(); - this.mColor = calendarEvent.getColor(); - this.mTextColor = calendarEvent.getTextColor(); - this.mStartTime = calendarEvent.getStartTime(); - this.mEndTime = calendarEvent.getEndTime(); - this.profileId = calendarEvent.getProfileId(); - this.lessonChangeDate = calendarEvent.getLessonChangeDate(); - this.lessonChangeCount = calendarEvent.getLessonChangeCount(); - } - - public LessonChangeEvent(long mId, int mColor, int mTextColor, Calendar mStartTime, Calendar mEndTime, int profileId, Date lessonChangeDate, int lessonChangeCount) { - this.mId = mId; - this.mColor = mColor; - this.mTextColor = mTextColor; - this.mStartTime = mStartTime; - this.mEndTime = mEndTime; - this.profileId = profileId; - this.lessonChangeDate = lessonChangeDate; - this.lessonChangeCount = lessonChangeCount; - } - - public int getProfileId() { - return profileId; - } - - public Date getLessonChangeDate() { - return lessonChangeDate; - } - - public int getLessonChangeCount() { - return lessonChangeCount; - } - - public void setProfileId(int profileId) { - this.profileId = profileId; - } - - public void setLessonChangeDate(Date lessonChangeDate) { - this.lessonChangeDate = lessonChangeDate; - } - - public void setLessonChangeCount(int lessonChangeCount) { - this.lessonChangeCount = lessonChangeCount; - } - - @Override - public void setPlaceholder(boolean placeholder) { - - } - - @Override - public boolean isPlaceholder() { - return false; - } - - @Override - public String getLocation() { - return null; - } - - @Override - public void setLocation(String mLocation) { - - } - - @Override - public long getId() { - return mId; - } - - @Override - public void setId(long mId) { - this.mId = mId; - } - - @Override - public boolean getShowBadge() { - return false; - } - - @Override - public void setShowBadge(boolean mShowBadge) { - - } - - @Override - public int getTextColor() { - return mTextColor; - } - - @Override - public void setTextColor(int mTextColor) { - this.mTextColor = mTextColor; - } - - @Override - public String getDescription() { - return null; - } - - @Override - public void setDescription(String mDescription) { - - } - - @Override - public boolean isAllDay() { - return false; - } - - @Override - public void setAllDay(boolean allDay) { - - } - - @Override - public Calendar getStartTime() { - return mStartTime; - } - - @Override - public void setStartTime(Calendar mStartTime) { - this.mStartTime = mStartTime; - } - - @Override - public Calendar getEndTime() { - return mEndTime; - } - - @Override - public void setEndTime(Calendar mEndTime) { - this.mEndTime = mEndTime; - } - - @Override - public String getTitle() { - return null; - } - - @Override - public void setTitle(String mTitle) { - - } - - @Override - public Calendar getInstanceDay() { - return mInstanceDay; - } - - @Override - public void setInstanceDay(Calendar mInstanceDay) { - this.mInstanceDay = mInstanceDay; - this.mInstanceDay.set(Calendar.HOUR, 0); - this.mInstanceDay.set(Calendar.MINUTE, 0); - this.mInstanceDay.set(Calendar.SECOND, 0); - this.mInstanceDay.set(Calendar.MILLISECOND, 0); - this.mInstanceDay.set(Calendar.AM_PM, 0); - } - - @Override - public IDayItem getDayReference() { - return mDayReference; - } - - @Override - public void setDayReference(IDayItem mDayReference) { - this.mDayReference = mDayReference; - } - - @Override - public IWeekItem getWeekReference() { - return mWeekReference; - } - - @Override - public void setWeekReference(IWeekItem mWeekReference) { - this.mWeekReference = mWeekReference; - } - - @Override - public CalendarEvent copy() { - return new LessonChangeEvent(this); - } - - @Override - public int getColor() { - return mColor; - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchange/LessonChangeEventRenderer.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchange/LessonChangeEventRenderer.java deleted file mode 100644 index 2490e1bf..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchange/LessonChangeEventRenderer.java +++ /dev/null @@ -1,28 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchange; - -import android.view.View; -import android.widget.TextView; - -import androidx.cardview.widget.CardView; - -import com.github.tibolte.agendacalendarview.render.EventRenderer; - -import pl.szczodrzynski.edziennik.R; - -public class LessonChangeEventRenderer extends EventRenderer { - @Override - public void render(View view, LessonChangeEvent event) { - CardView card = view.findViewById(R.id.lesson_change_card); - TextView changeText = view.findViewById(R.id.lesson_change_text); - TextView changeCount = view.findViewById(R.id.lessonChangeCount); - card.setCardBackgroundColor(event.getColor()); - changeText.setTextColor(event.getTextColor()); - changeCount.setTextColor(event.getTextColor()); - changeCount.setText(String.valueOf(event.getLessonChangeCount())); - } - - @Override - public int getEventLayout() { - return R.layout.agenda_event_lesson_change; - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEvent.kt new file mode 100644 index 00000000..b38d8829 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEvent.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-8. + */ + +package pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges + +import pl.szczodrzynski.edziennik.ui.modules.agenda.BaseEvent +import pl.szczodrzynski.edziennik.utils.models.Date + +class LessonChangesEvent( + val profileId: Int, + val date: Date, + val count: Int, + showBadge: Boolean +) : BaseEvent( + id = date.value.toLong(), + time = date.asCalendar, + color = 0xff78909c.toInt(), + showBadge = false, + showItemBadge = showBadge +) { + override fun copy() = LessonChangesEvent(profileId, date, count, showItemBadge) + + override fun getShowBadge() = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEventRenderer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEventRenderer.kt new file mode 100644 index 00000000..5f66cc27 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/lessonchanges/LessonChangesEventRenderer.kt @@ -0,0 +1,55 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-8. + */ + +package pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchanges + +import android.view.View +import androidx.core.view.isVisible +import com.github.tibolte.agendacalendarview.render.EventRenderer +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.databinding.AgendaCounterItemBinding +import pl.szczodrzynski.edziennik.databinding.AgendaWrappedCounterBinding +import pl.szczodrzynski.edziennik.resolveAttr +import pl.szczodrzynski.edziennik.setTintColor +import pl.szczodrzynski.edziennik.utils.Colors + +class LessonChangesEventRenderer : EventRenderer() { + + override fun render(view: View, event: LessonChangesEvent) { + val b = AgendaWrappedCounterBinding.bind(view).item + val textColor = Colors.legibleTextColor(event.color) + + b.card.foreground.setTintColor(event.color) + b.card.background.setTintColor(event.color) + b.name.setText(R.string.agenda_lesson_changes) + b.name.setTextColor(textColor) + b.count.text = event.count.toString() + b.count.setTextColor(textColor) + + b.badgeBackground.isVisible = event.showItemBadge + b.badgeBackground.background.setTintColor( + android.R.attr.colorBackground.resolveAttr(view.context) + ) + b.badge.isVisible = event.showItemBadge + } + + fun render(b: AgendaCounterItemBinding, event: LessonChangesEvent) { + val textColor = Colors.legibleTextColor(event.color) + + b.card.foreground.setTintColor(event.color) + b.card.background.setTintColor(event.color) + b.name.setText(R.string.agenda_lesson_changes) + b.name.setTextColor(textColor) + b.count.text = event.count.toString() + b.count.setTextColor(textColor) + + b.badgeBackground.isVisible = event.showItemBadge + b.badgeBackground.background.setTintColor( + android.R.attr.colorBackground.resolveAttr(b.root.context) + ) + b.badge.isVisible = event.showItemBadge + } + + override fun getEventLayout(): Int = R.layout.agenda_wrapped_counter +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceCounter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceCounter.kt deleted file mode 100644 index 6017be16..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceCounter.kt +++ /dev/null @@ -1,10 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence - -import pl.szczodrzynski.edziennik.utils.models.Date - -class TeacherAbsenceCounter ( - val teacherAbsenceDate: Date, - var teacherAbsenceCount: Int = 0 -) - - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEvent.kt index fc1c28db..b0b01f50 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEvent.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEvent.kt @@ -1,188 +1,21 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-8. + */ + package pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence -import com.github.tibolte.agendacalendarview.models.CalendarEvent -import com.github.tibolte.agendacalendarview.models.IDayItem -import com.github.tibolte.agendacalendarview.models.IWeekItem +import pl.szczodrzynski.edziennik.ui.modules.agenda.BaseEvent import pl.szczodrzynski.edziennik.utils.models.Date -import java.util.* -class TeacherAbsenceEvent : CalendarEvent { - /** - * Id of the event. - */ - private var mId: Long = 0 - /** - * Color to be displayed in the agenda view. - */ - private var mColor: Int = 0 - /** - * Text color displayed on the background color - */ - private var mTextColor: Int = 0 - /** - * Calendar instance helping sorting the events per section in the agenda view. - */ - private var mInstanceDay: Calendar? = null - /** - * Start time of the event. - */ - private var mStartTime: Calendar? = null - /** - * End time of the event. - */ - private var mEndTime: Calendar? = null - /** - * References to a DayItem instance for that event, used to link interaction between the - * calendar view and the agenda view. - */ - private var mDayReference: IDayItem? = null - /** - * References to a WeekItem instance for that event, used to link interaction between the - * calendar view and the agenda view. - */ - private var mWeekReference: IWeekItem? = null - - - private var profileId: Int = 0 - var teacherAbsenceDate: Date? = null - var teacherAbsenceCount: Int = 0 - - constructor(calendarEvent: TeacherAbsenceEvent) { - this.mId = calendarEvent.id - this.mColor = calendarEvent.color - this.mTextColor = calendarEvent.textColor - this.mStartTime = calendarEvent.startTime - this.mEndTime = calendarEvent.endTime - this.profileId = calendarEvent.profileId - this.teacherAbsenceDate = calendarEvent.teacherAbsenceDate - this.teacherAbsenceCount = calendarEvent.teacherAbsenceCount - } - - constructor(mId: Long, mColor: Int, mTextColor: Int, mStartTime: Calendar, mEndTime: Calendar, profileId: Int, teacherAbsenceDate: Date, teacherAbsenceCount: Int) { - this.mId = mId - this.mColor = mColor - this.mTextColor = mTextColor - this.mStartTime = mStartTime - this.mEndTime = mEndTime - this.profileId = profileId - this.teacherAbsenceDate = teacherAbsenceDate - this.teacherAbsenceCount = teacherAbsenceCount - } - - override fun setPlaceholder(placeholder: Boolean) { - - } - - override fun isPlaceholder(): Boolean { - return false - } - - override fun getLocation(): String? { - return null - } - - override fun setLocation(mLocation: String) { - - } - - override fun getId(): Long { - return mId - } - - override fun setId(mId: Long) { - this.mId = mId - } - - override fun getShowBadge(): Boolean { - return false - } - - override fun setShowBadge(mShowBadge: Boolean) { - - } - - override fun getTextColor(): Int { - return mTextColor - } - - override fun setTextColor(mTextColor: Int) { - this.mTextColor = mTextColor - } - - override fun getDescription(): String? { - return null - } - - override fun setDescription(mDescription: String) { - - } - - override fun isAllDay(): Boolean { - return false - } - - override fun setAllDay(allDay: Boolean) { - - } - - override fun getStartTime(): Calendar? { - return mStartTime - } - - override fun setStartTime(mStartTime: Calendar) { - this.mStartTime = mStartTime - } - - override fun getEndTime(): Calendar? { - return mEndTime - } - - override fun setEndTime(mEndTime: Calendar) { - this.mEndTime = mEndTime - } - - override fun getTitle(): String? { - return null - } - - override fun setTitle(mTitle: String) { - - } - - override fun getInstanceDay(): Calendar? { - return mInstanceDay - } - - override fun setInstanceDay(mInstanceDay: Calendar) { - this.mInstanceDay = mInstanceDay - this.mInstanceDay!!.set(Calendar.HOUR, 0) - this.mInstanceDay!!.set(Calendar.MINUTE, 0) - this.mInstanceDay!!.set(Calendar.SECOND, 0) - this.mInstanceDay!!.set(Calendar.MILLISECOND, 0) - this.mInstanceDay!!.set(Calendar.AM_PM, 0) - } - - override fun getDayReference(): IDayItem? { - return mDayReference - } - - override fun setDayReference(mDayReference: IDayItem) { - this.mDayReference = mDayReference - } - - override fun getWeekReference(): IWeekItem? { - return mWeekReference - } - - override fun setWeekReference(mWeekReference: IWeekItem) { - this.mWeekReference = mWeekReference - } - - override fun copy(): CalendarEvent { - return TeacherAbsenceEvent(this) - } - - override fun getColor(): Int { - return mColor - } +class TeacherAbsenceEvent( + val profileId: Int, + val date: Date, + val count: Int +) : BaseEvent( + id = date.value.toLong(), + time = date.asCalendar, + color = 0xffff1744.toInt(), + showBadge = false +) { + override fun copy() = TeacherAbsenceEvent(profileId, date, count) } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt index 3789beb8..8d70f941 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/agenda/teacherabsence/TeacherAbsenceEventRenderer.kt @@ -1,21 +1,48 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-8. + */ + package pl.szczodrzynski.edziennik.ui.modules.agenda.teacherabsence import android.view.View -import android.widget.TextView -import androidx.cardview.widget.CardView +import androidx.core.view.isVisible import com.github.tibolte.agendacalendarview.render.EventRenderer import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.databinding.AgendaCounterItemBinding +import pl.szczodrzynski.edziennik.databinding.AgendaWrappedCounterBinding +import pl.szczodrzynski.edziennik.setTintColor +import pl.szczodrzynski.edziennik.utils.Colors class TeacherAbsenceEventRenderer : EventRenderer() { - override fun render(view: View?, event: TeacherAbsenceEvent) { - val card = view?.findViewById(R.id.teacherAbsenceCard) - val changeText = view?.findViewById(R.id.teacherAbsenceText) - val changeCount = view?.findViewById(R.id.teacherAbsenceCount) - card?.setCardBackgroundColor(event.color) - changeText?.setTextColor(event.textColor) - changeCount?.setTextColor(event.textColor) - changeCount?.text = event.teacherAbsenceCount.toString() + + override fun render(view: View, event: TeacherAbsenceEvent) { + val b = AgendaWrappedCounterBinding.bind(view).item + val textColor = Colors.legibleTextColor(event.color) + + b.card.foreground.setTintColor(event.color) + b.card.background.setTintColor(event.color) + b.name.setText(R.string.agenda_teacher_absence) + b.name.setTextColor(textColor) + b.count.text = event.count.toString() + b.count.setTextColor(textColor) + + b.badgeBackground.isVisible = false + b.badge.isVisible = false } - override fun getEventLayout(): Int { return R.layout.agenda_event_teacher_absence } + fun render(b: AgendaCounterItemBinding, event: TeacherAbsenceEvent) { + val textColor = Colors.legibleTextColor(event.color) + + b.card.foreground.setTintColor(event.color) + b.card.background.setTintColor(event.color) + b.name.setText(R.string.agenda_teacher_absence) + b.name.setTextColor(textColor) + b.count.text = event.count.toString() + b.count.setTextColor(textColor) + + b.badgeBackground.isVisible = false + b.badge.isVisible = false + } + + override fun getEventLayout(): Int = R.layout.agenda_wrapped_counter } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java index a5501472..ee88da07 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/announcements/AnnouncementsAdapter.java @@ -16,7 +16,7 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.List; import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementFull; +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull; import pl.szczodrzynski.edziennik.databinding.RowAnnouncementsItemBinding; import pl.szczodrzynski.edziennik.ui.modules.messages.MessagesUtils; @@ -59,17 +59,20 @@ public class AnnouncementsAdapter extends RecyclerView.Adapter { activity.getBottomSheet().close(); - AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_ANNOUNCEMENT, true)); - Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show(); + if (app.getProfile().getLoginStoreType() == LOGIN_TYPE_LIBRUS) { + EdziennikTask.Companion.announcementsRead(App.Companion.getProfileId()).enqueue(requireContext()); + } else { + AsyncTask.execute(() -> App.db.metadataDao().setAllSeen(App.Companion.getProfileId(), TYPE_ANNOUNCEMENT, true)); + Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show(); + } }) ); @@ -80,8 +91,20 @@ public class AnnouncementsFragment extends Fragment { recyclerView.setLayoutManager(linearLayoutManager); recyclerView.addItemDecoration(new SimpleDividerItemDecoration(view.getContext())); - app.db.announcementDao().getAll(App.profileId).observe(this, announcements -> { - if (app == null || app.profile == null || activity == null || b == null || !isAdded()) + recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() { + @Override + public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) { + if (recyclerView.canScrollVertically(-1)) { + b.refreshLayout.setEnabled(false); + } + if (!recyclerView.canScrollVertically(-1) && newState == SCROLL_STATE_IDLE) { + b.refreshLayout.setEnabled(true); + } + } + }); + + app.db.announcementDao().getAll(App.Companion.getProfileId()).observe(this, announcements -> { + if (app == null || activity == null || b == null || !isAdded()) return; if (announcements == null) { @@ -97,20 +120,10 @@ public class AnnouncementsFragment extends Fragment { return; }*/ AnnouncementsAdapter announcementsAdapter = new AnnouncementsAdapter(activity, announcements, (v, announcement) -> { - MaterialDialog dialog = new MaterialDialog.Builder(activity) - .title(announcement.subject) - .customView(R.layout.dialog_announcement, true) - .positiveText(R.string.ok) - .show(); - DialogAnnouncementBinding b = DialogAnnouncementBinding.bind(dialog.getCustomView()); - b.text.setText(announcement.teacherFullName+"\n\n"+ (announcement.startDate != null ? announcement.startDate.getFormattedString() : "-")+" do "+ (announcement.endDate != null ? announcement.endDate.getFormattedString() : "-")+"\n\n" +announcement.text); - if (!announcement.seen) { - announcement.seen = true; - AsyncTask.execute(() -> { - app.db.metadataDao().setSeen(App.profileId, announcement, true); - }); - if (recyclerView.getAdapter() != null) - recyclerView.getAdapter().notifyDataSetChanged(); + if (announcement.getText() == null || (app.getProfile().getLoginStoreType() == LOGIN_TYPE_LIBRUS && !announcement.getSeen())) { + EdziennikTask.Companion.announcementGet(App.Companion.getProfileId(), announcement).enqueue(requireContext()); + } else { + showAnnouncementDetailsDialog(announcement); } }); @@ -128,4 +141,38 @@ public class AnnouncementsFragment extends Fragment { } }); } + + @Override + public void onStart() { + EventBus.getDefault().register(this); + super.onStart(); + } + + @Override + public void onStop() { + EventBus.getDefault().unregister(this); + super.onStop(); + } + + @Subscribe(threadMode = ThreadMode.MAIN, sticky = true) + public void onAnnouncementGetEvent(AnnouncementGetEvent event) { + EventBus.getDefault().removeStickyEvent(event); + showAnnouncementDetailsDialog(event.getAnnouncement()); + } + + private void showAnnouncementDetailsDialog(AnnouncementFull announcement) { + DialogAnnouncementBinding b = DialogAnnouncementBinding.inflate(LayoutInflater.from(activity), null, false); + new MaterialAlertDialogBuilder(activity) + .setTitle(announcement.getSubject()) + .setView(b.getRoot()) + .setPositiveButton(R.string.ok, null) + .show(); + b.text.setText(announcement.getTeacherName() +"\n\n"+ (announcement.getStartDate() != null ? announcement.getStartDate().getFormattedString() : "-") + (announcement.getEndDate() != null ? " do " + announcement.getEndDate().getFormattedString() : "")+"\n\n" +announcement.getText()); + if (!announcement.getSeen() && app.getProfile().getLoginStoreType() != LOGIN_TYPE_LIBRUS) { + announcement.setSeen(true); + AsyncTask.execute(() -> App.db.metadataDao().setSeen(App.Companion.getProfileId(), announcement, true)); + if (recyclerView.getAdapter() != null) + recyclerView.getAdapter().notifyDataSetChanged(); + } + } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java deleted file mode 100644 index e1e53f5a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java +++ /dev/null @@ -1,128 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.modules.attendance; - -import android.content.Context; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffColorFilter; -import android.os.AsyncTask; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import java.util.List; - -import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceFull; - -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT_EXCUSED; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED_EXCUSED; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_PRESENT; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_RELEASED; - -public class AttendanceAdapter extends RecyclerView.Adapter { - private Context context; - public List attendanceList; - - //getting the context and product list with constructor - public AttendanceAdapter(Context mCtx, List noticeList) { - this.context = mCtx; - this.attendanceList = noticeList; - } - - @NonNull - @Override - public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - //inflating and returning our view holder - LayoutInflater inflater = LayoutInflater.from(context); - View view = inflater.inflate(R.layout.row_attendance_item, parent, false); - return new ViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull ViewHolder holder, int position) { - App app = (App) context.getApplicationContext(); - - AttendanceFull attendance = attendanceList.get(position); - - holder.attendanceLessonTopic.setText(attendance.lessonTopic); - holder.attendanceTeacher.setText(attendance.teacherFullName); - holder.attendanceSubject.setText(attendance.subjectLongName); - holder.attendanceDate.setText(attendance.lessonDate.getStringDmy()); - holder.attendanceTime.setText(attendance.startTime.getStringHM()); - - switch (attendance.type) { - case TYPE_ABSENT: - holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xfff44336, PorterDuff.Mode.MULTIPLY)); - holder.attendanceType.setText(R.string.attendance_absent); - break; - case TYPE_ABSENT_EXCUSED: - holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xffaeea00, PorterDuff.Mode.MULTIPLY)); - holder.attendanceType.setText(R.string.attendance_absent_excused); - break; - case TYPE_BELATED: - holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xffffca28, PorterDuff.Mode.MULTIPLY)); - holder.attendanceType.setText(R.string.attendance_belated); - break; - case TYPE_BELATED_EXCUSED: - holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xff4bb733, PorterDuff.Mode.MULTIPLY)); - holder.attendanceType.setText(R.string.attendance_belated_excused); - break; - case TYPE_RELEASED: - holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xff9e9e9e, PorterDuff.Mode.MULTIPLY)); - holder.attendanceType.setText(R.string.attendance_released); - break; - case TYPE_PRESENT: - holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xffffae00, PorterDuff.Mode.MULTIPLY)); - holder.attendanceType.setText(R.string.attendance_present); - break; - default: - holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xff03a9f4, PorterDuff.Mode.MULTIPLY)); - holder.attendanceType.setText("?"); - break; - } - - if (!attendance.seen) { - holder.attendanceLessonTopic.setBackground(context.getResources().getDrawable(R.drawable.bg_rounded_8dp)); - holder.attendanceLessonTopic.getBackground().setColorFilter(new PorterDuffColorFilter(0x692196f3, PorterDuff.Mode.MULTIPLY)); - attendance.seen = true; - AsyncTask.execute(() -> { - app.db.metadataDao().setSeen(App.profileId, attendance, true); - //Intent i = new Intent("android.intent.action.MAIN").putExtra(MainActivity.ACTION_UPDATE_BADGES, "yes, sure"); - //context.sendBroadcast(i); - }); - } - else { - holder.attendanceLessonTopic.setBackground(null); - } - } - - @Override - public int getItemCount() { - return attendanceList.size(); - } - - class ViewHolder extends RecyclerView.ViewHolder { - - TextView attendanceType; - TextView attendanceLessonTopic; - TextView attendanceSubject; - TextView attendanceTeacher; - TextView attendanceDate; - TextView attendanceTime; - - ViewHolder(View itemView) { - super(itemView); - attendanceType = itemView.findViewById(R.id.attendanceType); - attendanceLessonTopic = itemView.findViewById(R.id.attendanceLessonTopic); - attendanceSubject = itemView.findViewById(R.id.attendanceSubject); - attendanceTeacher = itemView.findViewById(R.id.attendanceTeacher); - attendanceDate = itemView.findViewById(R.id.attendanceDate); - attendanceTime = itemView.findViewById(R.id.attendanceTime); - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.kt new file mode 100644 index 00000000..0dcae97e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.kt @@ -0,0 +1,190 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-29. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance + +import android.animation.ObjectAnimator +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.isInvisible +import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.startCoroutineTimer +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.* +import pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder.* +import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel +import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder +import kotlin.coroutines.CoroutineContext + +class AttendanceAdapter( + val activity: AppCompatActivity, + val type: Int, + var onAttendanceClick: ((item: AttendanceFull) -> Unit)? = null +) : RecyclerView.Adapter(), CoroutineScope { + companion object { + private const val TAG = "AttendanceAdapter" + private const val ITEM_TYPE_ATTENDANCE = 0 + private const val ITEM_TYPE_DAY_RANGE = 1 + private const val ITEM_TYPE_MONTH = 2 + private const val ITEM_TYPE_SUBJECT = 3 + private const val ITEM_TYPE_TYPE = 4 + private const val ITEM_TYPE_EMPTY = 5 + const val STATE_CLOSED = 0 + const val STATE_OPENED = 1 + } + + private val app = activity.applicationContext as App + // optional: place the manager here + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + var items = mutableListOf() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + val inflater = LayoutInflater.from(parent.context) + return when (viewType) { + ITEM_TYPE_ATTENDANCE -> AttendanceViewHolder(inflater, parent) + ITEM_TYPE_DAY_RANGE -> DayRangeViewHolder(inflater, parent) + ITEM_TYPE_MONTH -> MonthViewHolder(inflater, parent) + ITEM_TYPE_SUBJECT -> SubjectViewHolder(inflater, parent) + ITEM_TYPE_TYPE -> TypeViewHolder(inflater, parent) + ITEM_TYPE_EMPTY -> EmptyViewHolder(inflater, parent) + else -> throw IllegalArgumentException("Incorrect viewType") + } + } + + override fun getItemViewType(position: Int): Int { + return when (items[position]) { + is AttendanceFull -> ITEM_TYPE_ATTENDANCE + is AttendanceDayRange -> ITEM_TYPE_DAY_RANGE + is AttendanceMonth -> ITEM_TYPE_MONTH + is AttendanceSubject -> ITEM_TYPE_SUBJECT + is AttendanceTypeGroup -> ITEM_TYPE_TYPE + is AttendanceEmpty -> ITEM_TYPE_EMPTY + else -> throw IllegalArgumentException("Incorrect viewType") + } + } + + private val onClickListener = View.OnClickListener { view -> + val model = view.getTag(R.string.tag_key_model) + if (model is AttendanceFull) { + onAttendanceClick?.invoke(model) + return@OnClickListener + } + if (model !is ExpandableItemModel<*>) + return@OnClickListener + expandModel(model, view) + } + + fun expandModel(model: ExpandableItemModel<*>?, view: View?, notifyAdapter: Boolean = true) { + model ?: return + val position = items.indexOf(model) + if (position == -1) + return + + view?.findViewById(R.id.dropdownIcon)?.let { dropdownIcon -> + ObjectAnimator.ofFloat( + dropdownIcon, + View.ROTATION, + if (model.state == STATE_CLOSED) 0f else 180f, + if (model.state == STATE_CLOSED) 180f else 0f + ).setDuration(200).start(); + } + + if (model is AttendanceDayRange || model is AttendanceMonth || model is AttendanceTypeGroup) { + // hide the preview, show summary + val preview = view?.findViewById(R.id.previewContainer) + val summary = view?.findViewById(R.id.summaryContainer) + val percentage = view?.findViewById(R.id.percentage) + preview?.isInvisible = model.state == STATE_CLOSED + summary?.isInvisible = model.state != STATE_CLOSED + percentage?.isVisible = model.state != STATE_CLOSED + } + + if (model.state == STATE_CLOSED) { + + val subItems = when { + model.items.isEmpty() -> listOf(AttendanceEmpty()) + else -> model.items + } + + model.state = STATE_OPENED + items.addAll(position + 1, subItems.filterNotNull()) + if (notifyAdapter) notifyItemRangeInserted(position + 1, subItems.size) + } + else { + val start = position + 1 + var end: Int = items.size + for (i in start until items.size) { + val model1 = items[i] + val level = (model1 as? ExpandableItemModel<*>)?.level ?: 3 + if (level <= model.level) { + end = i + break + } else { + if (model1 is ExpandableItemModel<*> && model1.state == STATE_OPENED) { + model1.state = STATE_CLOSED + } + } + } + + if (end != -1) { + items.subList(start, end).clear() + if (notifyAdapter) notifyItemRangeRemoved(start, end - start) + } + + model.state = STATE_CLOSED + } + } + + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + val item = items[position] + if (holder !is BindableViewHolder<*, *>) + return + + val viewType = when (holder) { + is AttendanceViewHolder -> ITEM_TYPE_ATTENDANCE + is DayRangeViewHolder -> ITEM_TYPE_DAY_RANGE + is MonthViewHolder -> ITEM_TYPE_MONTH + is SubjectViewHolder -> ITEM_TYPE_SUBJECT + is TypeViewHolder -> ITEM_TYPE_TYPE + is EmptyViewHolder -> ITEM_TYPE_EMPTY + else -> throw IllegalArgumentException("Incorrect viewType") + } + holder.itemView.setTag(R.string.tag_key_view_type, viewType) + holder.itemView.setTag(R.string.tag_key_position, position) + holder.itemView.setTag(R.string.tag_key_model, item) + + when { + holder is AttendanceViewHolder && item is AttendanceFull -> holder.onBind(activity, app, item, position, this) + holder is DayRangeViewHolder && item is AttendanceDayRange -> holder.onBind(activity, app, item, position, this) + holder is MonthViewHolder && item is AttendanceMonth -> holder.onBind(activity, app, item, position, this) + holder is SubjectViewHolder && item is AttendanceSubject -> holder.onBind(activity, app, item, position, this) + holder is TypeViewHolder && item is AttendanceTypeGroup -> holder.onBind(activity, app, item, position, this) + holder is EmptyViewHolder && item is AttendanceEmpty -> holder.onBind(activity, app, item, position, this) + } + + holder.itemView.setOnClickListener(onClickListener) + } + + fun notifyItemChanged(model: Any) { + startCoroutineTimer(1000L, 0L) { + val index = items.indexOf(model) + if (index != -1) + notifyItemChanged(index) + } + } + + override fun getItemCount() = items.size +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceBar.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceBar.kt new file mode 100644 index 00000000..70be9256 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceBar.kt @@ -0,0 +1,106 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-1. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance + +import android.annotation.SuppressLint +import android.content.Context +import android.graphics.* +import android.text.TextPaint +import android.util.AttributeSet +import android.view.View +import pl.szczodrzynski.edziennik.dp +import pl.szczodrzynski.edziennik.utils.Colors +import kotlin.math.roundToInt + +/* https://github.com/JakubekWeg/Mobishit/blob/master/app/src/main/java/jakubweg/mobishit/view/AttendanceBarView.kt */ +class AttendanceBar : View { + + constructor(context: Context) : super(context) + + constructor(context: Context, attrs: AttributeSet) : super(context, attrs) + + constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) + + private var attendancesList = listOf() + private val mainPaint = Paint(Paint.ANTI_ALIAS_FLAG) + private val textPaint = TextPaint(Paint.ANTI_ALIAS_FLAG).also { + it.textAlign = Paint.Align.CENTER + } + private var mPath = Path() + private var mCornerRadius: Float = 0.toFloat() + + init { + mCornerRadius = 4.dp.toFloat() + + if (isInEditMode) + setAttendanceData(listOf( + 0xff43a047.toInt() to 23, + 0xff009688.toInt() to 187, + 0xff3f51b5.toInt() to 46, + 0xff3f51b5.toInt() to 5, + 0xffffc107.toInt() to 5, + 0xff9e9e9e.toInt() to 26, + 0xff76ff03.toInt() to 34, + 0xffff3d00.toInt() to 8 + )) + } + + // color, count + private class AttendanceItem(var color: Int, var count: Int) + + fun setAttendanceData(list: List>) { + attendancesList = list.map { AttendanceItem(it.first, it.second) } + setWillNotDraw(false) + invalidate() + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + val r = RectF(0f, 0f, w.toFloat(), h.toFloat()) + mPath = Path().apply { + addRoundRect(r, mCornerRadius, mCornerRadius, Path.Direction.CW) + close() + } + } + + @SuppressLint("DrawAllocation", "CanvasSize") + override fun onDraw(canvas: Canvas?) { + canvas ?: return + + val sum = attendancesList.sumBy { it.count } + if (sum == 0) { + return + } + + canvas.clipPath(mPath) + + val top = paddingTop.toFloat() + val bottom = (height - paddingBottom).toFloat() + var left = paddingLeft.toFloat() + val unitWidth = (width - paddingRight - paddingLeft).toFloat() / sum.toFloat() + + textPaint.color = Color.BLACK + textPaint.textSize = 14.dp.toFloat() + + for (e in attendancesList) { + if (e.count == 0) + continue + + val width = unitWidth * e.count + mainPaint.color = e.color + canvas.drawRect(left, top, left + width, bottom, mainPaint) + + val percentage = (100f * e.count / sum).roundToInt().toString() + "%" + val textBounds = Rect() + textPaint.getTextBounds(percentage, 0, percentage.length, textBounds) + if (width > textBounds.width() + 8.dp && height > textBounds.height() + 2.dp) { + textPaint.color = Colors.legibleTextColor(e.color) + canvas.drawText(percentage, left + width / 2, bottom - height / 2 + textBounds.height()/2, textPaint) + } + + left += width + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceDetailsDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceDetailsDialog.kt new file mode 100644 index 00000000..5ee6bdc3 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceDetailsDialog.kt @@ -0,0 +1,73 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-9. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.core.graphics.ColorUtils +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.databinding.AttendanceDetailsDialogBinding +import pl.szczodrzynski.edziennik.setTintColor +import pl.szczodrzynski.edziennik.utils.BetterLink +import kotlin.coroutines.CoroutineContext + +class AttendanceDetailsDialog( + val activity: AppCompatActivity, + val attendance: AttendanceFull, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "AttendanceDetailsDialog" + } + + private lateinit var app: App + private lateinit var b: AttendanceDetailsDialogBinding + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local variables go here + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + b = AttendanceDetailsDialogBinding.inflate(activity.layoutInflater) + dialog = MaterialAlertDialogBuilder(activity) + .setView(b.root) + .setPositiveButton(R.string.close, null) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + val manager = app.attendanceManager + + val attendanceColor = manager.getAttendanceColor(attendance) + b.attendance = attendance + b.devMode = App.devMode + b.attendanceName.setTextColor(if (ColorUtils.calculateLuminance(attendanceColor) > 0.3) 0xaa000000.toInt() else 0xccffffff.toInt()) + b.attendanceName.background.setTintColor(attendanceColor) + + b.attendanceIsCounted.setText(if (attendance.isCounted) R.string.yes else R.string.no) + + attendance.teacherName?.let { name -> + BetterLink.attach( + b.teacherName, + teachers = mapOf(attendance.teacherId to name), + onActionSelected = dialog::dismiss + ) + } + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java deleted file mode 100644 index 68942d5b..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.java +++ /dev/null @@ -1,361 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.modules.attendance; - -import android.graphics.Color; -import android.os.AsyncTask; -import android.os.Bundle; -import android.os.Handler; -import android.util.LongSparseArray; -import android.view.Gravity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.animation.AccelerateDecelerateInterpolator; -import android.view.animation.Animation; -import android.view.animation.Transformation; -import android.widget.Toast; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.PopupMenu; -import androidx.core.graphics.ColorUtils; -import androidx.databinding.DataBindingUtil; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.danimahardhika.cafebar.CafeBar; -import com.mikepenz.iconics.IconicsColor; -import com.mikepenz.iconics.IconicsDrawable; -import com.mikepenz.iconics.IconicsSize; -import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial; - -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -import antonkozyriatskyi.circularprogressindicator.CircularProgressIndicator; -import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.MainActivity; -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceFull; -import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject; -import pl.szczodrzynski.edziennik.databinding.FragmentAttendanceBinding; -import pl.szczodrzynski.edziennik.utils.Themes; -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.utils.models.Week; -import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem; - -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT_EXCUSED; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED_EXCUSED; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_PRESENT; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_RELEASED; -import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK; -import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_VULCAN; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_ATTENDANCE; - -public class AttendanceFragment extends Fragment { - - private App app = null; - private MainActivity activity = null; - private FragmentAttendanceBinding b = null; - - private int displayMode = MODE_YEAR; - private static final int MODE_YEAR = 0; - private static final int MODE_SEMESTER_1 = 1; - private static final int MODE_SEMESTER_2 = 2; - private long subjectIdFilter = -1; - private LongSparseArray subjectTotalCount; - private LongSparseArray subjectAbsentCount; - private LongSparseArray subjectAttendancePercentage; - - private List attendanceList = null; - - @Override - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - activity = (MainActivity) getActivity(); - if (getActivity() == null || getContext() == null) - return null; - app = (App) activity.getApplication(); - getContext().getTheme().applyStyle(Themes.INSTANCE.getAppTheme(), true); - if (app.profile == null) - return inflater.inflate(R.layout.fragment_loading, container, false); - // activity, context and profile is valid - b = DataBindingUtil.inflate(inflater, R.layout.fragment_attendance, container, false); - b.refreshLayout.setParent(activity.getSwipeRefreshLayout()); - return b.getRoot(); - } - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - if (app == null || app.profile == null || activity == null || b == null || !isAdded()) - return; - - activity.getBottomSheet().prependItems( - new BottomSheetPrimaryItem(true) - .withTitle(R.string.menu_mark_as_read) - .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) - .withOnClickListener(v3 -> { - activity.getBottomSheet().close(); - AsyncTask.execute(() -> app.db.metadataDao().setAllSeen(App.profileId, TYPE_ATTENDANCE, true)); - Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show(); - }) - ); - - /*b.refreshLayout.setOnRefreshListener(() -> { - activity.syncCurrentFeature(MainActivity.DRAWER_ITEM_ATTENDANCE, b.refreshLayout); - });*/ - - b.attendancePercentage.setProgressTextAdapter(PERCENTAGE_ADAPTER); - b.attendancePercentage.setMaxProgress(100.0f); - - b.attendanceSummaryTitle.setOnClickListener((v -> { - PopupMenu popupMenu = new PopupMenu(activity, b.attendanceSummaryTitle, Gravity.END); - popupMenu.getMenu().add(0, 0, 0, R.string.summary_mode_year); - popupMenu.getMenu().add(0, 1, 1, R.string.summary_mode_semester_1); - popupMenu.getMenu().add(0, 2, 2, R.string.summary_mode_semester_2); - popupMenu.setOnMenuItemClickListener((item -> { - displayMode = item.getItemId(); - updateList(); - return true; - })); - popupMenu.show(); - })); - - if (app.profile.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK) { - long attendanceLastSync = app.profile.getStudentData("attendanceLastSync", (long)0); - if (attendanceLastSync == 0) { - attendanceLastSync = app.profile.getSemesterStart(1).getInMillis(); - } - Date lastSyncDate = Date.fromMillis(attendanceLastSync); - if (lastSyncDate.getValue() < Week.getWeekStart().getValue()) { - CafeBar.builder(activity) - .to(activity.getNavView().getCoordinator()) - .content(R.string.sync_old_data_info) - .icon(new IconicsDrawable(activity).icon(CommunityMaterial.Icon.cmd_download_outline).size(IconicsSize.dp(20)).color(IconicsColor.colorInt(Themes.INSTANCE.getPrimaryTextColor(activity)))) - .positiveText(R.string.refresh) - .positiveColor(0xff4caf50) - .negativeText(R.string.ok) - .negativeColor(0x66ffffff) - .onPositive((cafeBar -> { - if (!activity.getSwipeRefreshLayout().isRefreshing()) { - cafeBar.dismiss(); - activity.syncCurrentFeature(); - } - else { - Toast.makeText(app, R.string.please_wait, Toast.LENGTH_SHORT).show(); - } - })) - .onNegative(CafeBar::dismiss) - .autoDismiss(false) - .swipeToDismiss(true) - .floating(true) - .show(); - } - } - - if (app.profile.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK && false) { - b.attendanceSummarySubject.setVisibility(View.GONE); - } - else { - b.attendanceSummarySubject.setOnClickListener((v -> { - AsyncTask.execute(() -> { - List subjectList = app.db.subjectDao().getAllNow(App.profileId); - PopupMenu popupMenu = new PopupMenu(activity, b.attendanceSummarySubject, Gravity.END); - popupMenu.getMenu().add(0, -1, 0, R.string.subject_filter_disabled); - int index = 0; - DecimalFormat format = new DecimalFormat("0.00"); - for (Subject subject: subjectList) { - int total = subjectTotalCount.get(subject.id, new int[3])[displayMode]; - int absent = subjectAbsentCount.get(subject.id, new int[3])[displayMode]; - if (total == 0) - continue; - int present = total - absent; - float percentage = (float)present / (float)total * 100.0f; - String percentageStr = format.format(percentage); - popupMenu.getMenu().add(0, (int)subject.id, index++, getString(R.string.subject_filter_format, subject.longName, percentageStr)); - } - popupMenu.setOnMenuItemClickListener((item -> { - subjectIdFilter = item.getItemId(); - b.attendanceSummarySubject.setText(item.getTitle().toString().replaceAll("\\s-\\s[0-9]{1,2}\\.[0-9]{1,2}%", "")); - updateList(); - return true; - })); - new Handler(activity.getMainLooper()).post(popupMenu::show); - }); - - })); - } - - LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext()); - - b.attendanceView.setHasFixedSize(true); - b.attendanceView.setLayoutManager(linearLayoutManager); - - app.db.attendanceDao().getAll(App.profileId).observe(this, attendance -> { - if (app == null || app.profile == null || activity == null || b == null || !isAdded()) - return; - - if (attendance == null) { - b.attendanceView.setVisibility(View.GONE); - b.attendanceNoData.setVisibility(View.VISIBLE); - return; - } - - attendanceList = attendance; - - countSubjectStats(); - - updateList(); - }); - } - - private void countSubjectStats() { - subjectTotalCount = new LongSparseArray<>(); - subjectAbsentCount = new LongSparseArray<>(); - for (AttendanceFull attendance: attendanceList) { - if (app.profile.getLoginStoreType() == LOGIN_TYPE_VULCAN && attendance.type == TYPE_RELEASED) - continue; - int[] subjectTotal = subjectTotalCount.get(attendance.subjectId, new int[3]); - int[] subjectAbsent = subjectAbsentCount.get(attendance.subjectId, new int[3]); - - subjectTotal[0]++; - subjectTotal[attendance.semester]++; - - if (attendance.type == TYPE_ABSENT || attendance.type == TYPE_ABSENT_EXCUSED) { - subjectAbsent[0]++; - subjectAbsent[attendance.semester]++; - } - - subjectTotalCount.put(attendance.subjectId, subjectTotal); - subjectAbsentCount.put(attendance.subjectId, subjectAbsent); - } - } - - private void updateList() { - if (app == null || app.profile == null || activity == null || b == null || !isAdded()) - return; - - int presentCount = 0; - int absentCount = 0; - int absentUnexcusedCount = 0; - int belatedCount = 0; - int releasedCount = 0; - - List filteredList = new ArrayList<>(); - for (AttendanceFull attendance: attendanceList) { - if (displayMode != MODE_YEAR && attendance.semester != displayMode) - continue; - if (subjectIdFilter != -1 && attendance.subjectId != subjectIdFilter) - continue; - if (attendance.type != TYPE_PRESENT) - filteredList.add(attendance); - switch (attendance.type) { - case TYPE_PRESENT: - presentCount++; - break; - case TYPE_ABSENT: - absentCount++; - absentUnexcusedCount++; - break; - case TYPE_ABSENT_EXCUSED: - absentCount++; - break; - case TYPE_BELATED_EXCUSED: - case TYPE_BELATED: - belatedCount++; - break; - case TYPE_RELEASED: - releasedCount++; - break; - } - } - if (filteredList.size() > 0) { - AttendanceAdapter adapter; - b.attendanceView.setVisibility(View.VISIBLE); - b.attendanceNoData.setVisibility(View.GONE); - if ((adapter = (AttendanceAdapter) b.attendanceView.getAdapter()) != null) { - adapter.attendanceList = filteredList; - adapter.notifyDataSetChanged(); - } - else { - adapter = new AttendanceAdapter(getContext(), filteredList); - b.attendanceView.setAdapter(adapter); - } - } - else { - b.attendanceView.setVisibility(View.GONE); - b.attendanceNoData.setVisibility(View.VISIBLE); - } - - // SUMMARY - if (displayMode == MODE_YEAR) { - b.attendanceSummaryTitle.setText(getString(R.string.attendance_summary_title_year)); - } - else { - b.attendanceSummaryTitle.setText(getString(R.string.attendance_summary_title_semester_format, displayMode)); - } - b.presentCountContainer.setVisibility(presentCount == 0 ? View.GONE : View.VISIBLE); - b.presentCount.setText(String.format(Locale.getDefault(), "%d", presentCount)); - b.absentCount.setText(String.format(Locale.getDefault(), "%d", absentCount)); - b.absentUnexcusedCount.setText(String.format(Locale.getDefault(), "%d", absentUnexcusedCount)); - b.belatedCount.setText(String.format(Locale.getDefault(), "%d", belatedCount)); - b.releasedCount.setText(String.format(Locale.getDefault(), "%d", releasedCount)); - if (absentUnexcusedCount >= 5) { - b.absentUnexcusedCount.setTextColor(Color.RED); - } - else { - b.absentUnexcusedCount.setTextColor(Themes.INSTANCE.getPrimaryTextColor(activity)); - } - - float attendancePercentage; - - // in Mobidziennik there are no TYPE_PRESENT records so we cannot calculate the percentage - if (app.profile.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK && false) { - attendancePercentage = app.profile.getAttendancePercentage(); - } - else if (app.profile.getLoginStoreType() == LOGIN_TYPE_VULCAN) { - float allCount = presentCount + absentCount + belatedCount; // do not count releases - float present = allCount - absentCount; - attendancePercentage = present / allCount * 100.0f; - } - else { - float allCount = presentCount + absentCount + belatedCount + releasedCount; - float present = allCount - absentCount; - attendancePercentage = present / allCount * 100.0f; - } - // if it's still 0%, hide the indicator - if (attendancePercentage <= 0.0f) { - b.attendancePercentage.setVisibility(View.GONE); - return; - } - animatePercentageIndicator(attendancePercentage); - } - - private void animatePercentageIndicator(float percentage) { - Animation a = new Animation() { - protected void applyTransformation(float interpolatedTime, Transformation t) { - float progress = percentage *interpolatedTime; - if (interpolatedTime == 1.0f) { - progress = percentage; - } - int color = ColorUtils.blendARGB(Color.RED, Color.GREEN, progress/100.0f); - b.attendancePercentage.setTextColor(color); - b.attendancePercentage.setProgressColor(color); - b.attendancePercentage.setCurrentProgress(progress); - } - public boolean willChangeBounds() { - return true; - } - }; - a.setDuration(1300); - a.setInterpolator(new AccelerateDecelerateInterpolator()); - b.attendancePercentage.postDelayed(() -> b.attendancePercentage.startAnimation(a), 500); - } - - private static final CircularProgressIndicator.ProgressTextAdapter PERCENTAGE_ADAPTER = value -> { - DecimalFormat df = new DecimalFormat("0.##"); - return df.format(value)+"%"; - }; -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt new file mode 100644 index 00000000..194f36d2 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceFragment.kt @@ -0,0 +1,117 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-30. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance + +import android.os.AsyncTask +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Toast +import androidx.fragment.app.Fragment +import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.databinding.AttendanceFragmentBinding +import pl.szczodrzynski.edziennik.ui.dialogs.settings.AttendanceConfigDialog +import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.FragmentLazyPagerAdapter +import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetPrimaryItem +import pl.szczodrzynski.navlib.bottomsheet.items.BottomSheetSeparatorItem +import kotlin.coroutines.CoroutineContext + +class AttendanceFragment : Fragment(), CoroutineScope { + companion object { + private const val TAG = "AttendanceFragment" + const val VIEW_SUMMARY = 0 + const val VIEW_DAYS = 1 + const val VIEW_MONTHS = 2 + const val VIEW_TYPES = 3 + const val VIEW_LIST = 4 + var pageSelection = 1 + } + + private lateinit var app: App + private lateinit var activity: MainActivity + private lateinit var b: AttendanceFragmentBinding + + private val job: Job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local/private variables go here + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + activity = (getActivity() as MainActivity?) ?: return null + context ?: return null + app = activity.application as App + b = AttendanceFragmentBinding.inflate(inflater) + b.refreshLayout.setParent(activity.swipeRefreshLayout) + return b.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + if (!isAdded) return + + activity.bottomSheet.prependItems( + BottomSheetPrimaryItem(true) + .withTitle(R.string.menu_attendance_config) + .withIcon(CommunityMaterial.Icon.cmd_cog_outline) + .withOnClickListener(View.OnClickListener { + activity.bottomSheet.close() + AttendanceConfigDialog(activity, true, null, null) + }), + BottomSheetSeparatorItem(true), + BottomSheetPrimaryItem(true) + .withTitle(R.string.menu_mark_as_read) + .withIcon(CommunityMaterial.Icon.cmd_eye_check_outline) + .withOnClickListener(View.OnClickListener { + activity.bottomSheet.close() + AsyncTask.execute { App.db.metadataDao().setAllSeen(App.profileId, Metadata.TYPE_ATTENDANCE, true) } + Toast.makeText(activity, R.string.main_menu_mark_as_read_success, Toast.LENGTH_SHORT).show() + }) + ) + activity.gainAttention() + + if (pageSelection == 1) + pageSelection = app.config.forProfile().attendance.attendancePageSelection + + val pagerAdapter = FragmentLazyPagerAdapter( + fragmentManager ?: return, + b.refreshLayout, + listOf( + AttendanceSummaryFragment() to getString(R.string.attendance_tab_summary), + + AttendanceListFragment().apply { + arguments = Bundle("viewType" to VIEW_DAYS) + } to getString(R.string.attendance_tab_days), + + AttendanceListFragment().apply { + arguments = Bundle("viewType" to VIEW_MONTHS) + } to getString(R.string.attendance_tab_months), + + AttendanceListFragment().apply { + arguments = Bundle("viewType" to VIEW_TYPES) + } to getString(R.string.attendance_tab_types), + + AttendanceListFragment().apply { + arguments = Bundle("viewType" to VIEW_LIST) + } to getString(R.string.attendance_tab_list) + ) + ) + b.viewPager.apply { + offscreenPageLimit = 1 + adapter = pagerAdapter + currentItem = pageSelection + addOnPageSelectedListener { + pageSelection = it + app.config.forProfile().attendance.attendancePageSelection = it + } + b.tabLayout.setupWithViewPager(this) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceListFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceListFragment.kt new file mode 100644 index 00000000..523dd09c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceListFragment.kt @@ -0,0 +1,231 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-30. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.view.isVisible +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import kotlinx.coroutines.* +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.databinding.AttendanceListFragmentBinding +import pl.szczodrzynski.edziennik.isNotNullNorEmpty +import pl.szczodrzynski.edziennik.startCoroutineTimer +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceDayRange +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceMonth +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceTypeGroup +import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment +import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSubject +import pl.szczodrzynski.edziennik.utils.models.Date +import kotlin.coroutines.CoroutineContext + +class AttendanceListFragment : LazyFragment(), CoroutineScope { + companion object { + private const val TAG = "AttendanceListFragment" + } + + private lateinit var app: App + private lateinit var activity: MainActivity + private lateinit var b: AttendanceListFragmentBinding + + private val job: Job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local/private variables go here + private val manager + get() = app.attendanceManager + private var viewType = AttendanceFragment.VIEW_DAYS + private var expandSubjectId = 0L + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + activity = (getActivity() as MainActivity?) ?: return null + context ?: return null + app = activity.application as App + b = AttendanceListFragmentBinding.inflate(inflater) + return b.root + } + + override fun onPageCreated(): Boolean { startCoroutineTimer(100L) { + if (!isAdded) return@startCoroutineTimer + + viewType = arguments?.getInt("viewType") ?: AttendanceFragment.VIEW_DAYS + expandSubjectId = arguments?.getLong("gradesSubjectId") ?: 0L + + val adapter = AttendanceAdapter(activity, viewType) + var firstRun = true + + app.db.attendanceDao().getAll(App.profileId).observe(this@AttendanceListFragment, Observer { items -> this@AttendanceListFragment.launch { + if (!isAdded) return@launch + + // load & configure the adapter + adapter.items = withContext(Dispatchers.Default) { processAttendance(items) } + if (adapter.items.isNotNullNorEmpty() && b.list.adapter == null) { + b.list.adapter = adapter + b.list.apply { + setHasFixedSize(true) + layoutManager = LinearLayoutManager(context) + addOnScrollListener(onScrollListener) + } + } + adapter.notifyDataSetChanged() + setSwipeToRefresh(adapter.items.isNullOrEmpty()) + + if (firstRun) { + expandSubject(adapter) + firstRun = false + } + + // show/hide relevant views + b.progressBar.isVisible = false + if (adapter.items.isNullOrEmpty()) { + b.list.isVisible = false + b.noData.isVisible = true + } else { + b.list.isVisible = true + b.noData.isVisible = false + } + }}) + + adapter.onAttendanceClick = { + AttendanceDetailsDialog(activity, it) + } + }; return true} + + private fun expandSubject(adapter: AttendanceAdapter) { + var expandSubjectModel: GradesSubject? = null + if (expandSubjectId != 0L) { + expandSubjectModel = adapter.items.firstOrNull { it is GradesSubject && it.subjectId == expandSubjectId } as? GradesSubject + adapter.expandModel( + model = expandSubjectModel, + view = null, + notifyAdapter = false + ) + } + + startCoroutineTimer(500L) { + if (expandSubjectModel != null) { + b.list.smoothScrollToPosition( + adapter.items.indexOf(expandSubjectModel) + expandSubjectModel.semesters.size + (expandSubjectModel.semesters.firstOrNull()?.grades?.size ?: 0) + ) + } + } + } + + @Suppress("SuspendFunctionOnCoroutineScope") + private fun processAttendance(attendance: List): MutableList { + if (attendance.isEmpty()) + return mutableListOf() + + val groupConsecutiveDays = app.config.forProfile().attendance.groupConsecutiveDays + val showPresenceInMonth = app.config.forProfile().attendance.showPresenceInMonth + + if (viewType == AttendanceFragment.VIEW_DAYS) { + val items = attendance + .filter { it.baseType != Attendance.TYPE_PRESENT } + .groupBy { it.date } + .map { AttendanceDayRange( + rangeStart = it.key, + rangeEnd = null, + items = it.value.toMutableList() + ) } + .toMutableList() + + if (groupConsecutiveDays) { + items.sortByDescending { it.rangeStart } + val iterator = items.listIterator() + + if (!iterator.hasNext()) + return items.toMutableList() + var element = iterator.next() + while (iterator.hasNext()) { + var nextElement = iterator.next() + while (Date.diffDays(element.rangeStart, nextElement.rangeStart) <= 1 && iterator.hasNext()) { + if (element.rangeEnd == null) + element.rangeEnd = element.rangeStart + + element.items.addAll(nextElement.items) + element.rangeStart = nextElement.rangeStart + iterator.remove() + nextElement = iterator.next() + } + element = nextElement + } + } + + return items.toMutableList() + } + else if (viewType == AttendanceFragment.VIEW_MONTHS) { + val items = attendance + .groupBy { it.date.year to it.date.month } + .map { AttendanceMonth( + year = it.key.first, + month = it.key.second, + items = it.value.toMutableList() + ) } + + items.forEach { month -> + month.typeCountMap = month.items + .groupBy { it.typeObject } + .map { it.key to it.value.size } + .sortedBy { it.first } + .toMap() + + val totalCount = month.typeCountMap.entries.sumBy { + if (!it.key.isCounted || it.key.baseType == Attendance.TYPE_UNKNOWN) + 0 + else it.value + } + val presenceCount = month.typeCountMap.entries.sumBy { + when (it.key.baseType) { + Attendance.TYPE_PRESENT, + Attendance.TYPE_PRESENT_CUSTOM, + Attendance.TYPE_BELATED, + Attendance.TYPE_BELATED_EXCUSED, + Attendance.TYPE_RELEASED -> if (it.key.isCounted) it.value else 0 + else -> 0 + } + } + + month.percentage = if (totalCount == 0) + 0f + else + presenceCount.toFloat() / totalCount.toFloat() * 100f + + if (!showPresenceInMonth) + month.items.removeAll { it.baseType == Attendance.TYPE_PRESENT } + } + + return items.toMutableList() + } + else if (viewType == AttendanceFragment.VIEW_TYPES) { + val items = attendance + .groupBy { it.typeObject } + .map { AttendanceTypeGroup( + type = it.key, + items = it.value.toMutableList() + ) } + .sortedBy { it.items.size } + + items.forEach { type -> + type.percentage = if (attendance.isEmpty()) + 0f + else + type.items.size.toFloat() / attendance.size.toFloat() * 100f + + type.semesterCount = type.items.count { it.semester == app.profile.currentSemester } + } + + return items.toMutableList() + } + return attendance.filter { it.baseType != Attendance.TYPE_PRESENT }.toMutableList() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceSummaryFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceSummaryFragment.kt new file mode 100644 index 00000000..39282325 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceSummaryFragment.kt @@ -0,0 +1,307 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-4. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance + +import android.graphics.Color +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.animation.AccelerateDecelerateInterpolator +import android.view.animation.Animation +import android.view.animation.Transformation +import android.widget.LinearLayout +import android.widget.TextView +import androidx.core.graphics.ColorUtils +import androidx.core.view.isInvisible +import androidx.core.view.isVisible +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.LinearLayoutManager +import kotlinx.coroutines.* +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.databinding.AttendanceSummaryFragmentBinding +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceFragment.Companion.VIEW_SUMMARY +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceSubject +import pl.szczodrzynski.edziennik.ui.modules.base.lazypager.LazyFragment +import pl.szczodrzynski.edziennik.ui.modules.grades.models.GradesSubject +import pl.szczodrzynski.edziennik.utils.models.Date +import java.text.DecimalFormat +import kotlin.coroutines.CoroutineContext + +class AttendanceSummaryFragment : LazyFragment(), CoroutineScope { + companion object { + private const val TAG = "AttendanceSummaryFragment" + private var periodSelection = 0 + } + + private lateinit var app: App + private lateinit var activity: MainActivity + private lateinit var b: AttendanceSummaryFragmentBinding + + private val job: Job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local/private variables go here + private val manager + get() = app.attendanceManager + private var expandSubjectId = 0L + private var attendance = listOf() + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + activity = (getActivity() as MainActivity?) ?: return null + context ?: return null + app = activity.application as App + b = AttendanceSummaryFragmentBinding.inflate(inflater) + return b.root + } + + override fun onPageCreated(): Boolean { startCoroutineTimer(100L) { + if (!isAdded) return@startCoroutineTimer + + expandSubjectId = arguments?.getLong("gradesSubjectId") ?: 0L + + val adapter = AttendanceAdapter(activity, VIEW_SUMMARY) + var firstRun = true + + app.db.attendanceDao().getAll(App.profileId).observe(this@AttendanceSummaryFragment, Observer { items -> this@AttendanceSummaryFragment.launch { + if (!isAdded) return@launch + + // load & configure the adapter + attendance = items + adapter.items = withContext(Dispatchers.Default) { processAttendance() } + if (adapter.items.isNotNullNorEmpty() && b.list.adapter == null) { + b.list.adapter = adapter + b.list.apply { + setHasFixedSize(false) + layoutManager = LinearLayoutManager(context) + isNestedScrollingEnabled = false + } + } + adapter.notifyDataSetChanged() + setSwipeToRefresh(adapter.items.isNullOrEmpty()) + + if (firstRun) { + expandSubject(adapter) + firstRun = false + } + + // show/hide relevant views + b.progressBar.isVisible = false + if (adapter.items.isNullOrEmpty()) { + b.statsLayout.isVisible = false + b.list.isVisible = false + b.noData.isVisible = true + } else { + b.statsLayout.isVisible = true + b.list.isVisible = true + b.noData.isVisible = false + } + }}) + + adapter.onAttendanceClick = { + AttendanceDetailsDialog(activity, it) + } + + b.toggleGroup.check(when (periodSelection) { + 0 -> R.id.allYear + 1 -> R.id.semester1 + 2 -> R.id.semester2 + else -> R.id.allYear + }) + b.toggleGroup.addOnButtonCheckedListener { _, checkedId, isChecked -> + if (!isChecked) + return@addOnButtonCheckedListener + periodSelection = when (checkedId) { + R.id.allYear -> 0 + R.id.semester1 -> 1 + R.id.semester2 -> 2 + else -> 0 + } + this@AttendanceSummaryFragment.launch { + adapter.items = withContext(Dispatchers.Default) { processAttendance() } + if (adapter.items.isNullOrEmpty()) { + b.statsLayout.isVisible = false + b.list.isVisible = false + b.noData.isVisible = true + } else { + b.statsLayout.isVisible = true + b.list.isVisible = true + b.noData.isVisible = false + } + adapter.notifyDataSetChanged() + } + } + }; return true} + + private fun expandSubject(adapter: AttendanceAdapter) { + var expandSubjectModel: GradesSubject? = null + if (expandSubjectId != 0L) { + expandSubjectModel = adapter.items.firstOrNull { it is GradesSubject && it.subjectId == expandSubjectId } as? GradesSubject + adapter.expandModel( + model = expandSubjectModel, + view = null, + notifyAdapter = false + ) + } + + startCoroutineTimer(500L) { + if (expandSubjectModel != null) { + b.list.smoothScrollToPosition( + adapter.items.indexOf(expandSubjectModel) + expandSubjectModel.semesters.size + (expandSubjectModel.semesters.firstOrNull()?.grades?.size ?: 0) + ) + } + } + } + + @Suppress("SuspendFunctionOnCoroutineScope") + private fun processAttendance(): MutableList { + val attendance = when (periodSelection) { + 0 -> attendance + 1 -> attendance.filter { it.semester == 1 } + 2 -> attendance.filter { it.semester == 2 } + else -> attendance + } + + if (attendance.isEmpty()) + return mutableListOf() + + val items = attendance + .groupBy { it.subjectId } + .map { AttendanceSubject( + subjectId = it.key, + subjectName = it.value.firstOrNull()?.subjectLongName ?: "", + items = it.value.toMutableList() + ) } + .sortedBy { it.subjectName.toLowerCase() } + + var totalCountSum = 0 + var presenceCountSum = 0 + + items.forEach { subject -> + subject.typeCountMap = subject.items + .groupBy { it.typeObject } + .map { it.key to it.value.size } + .sortedBy { it.first } + .toMap() + + val totalCount = subject.typeCountMap.entries.sumBy { + if (!it.key.isCounted || it.key.baseType == Attendance.TYPE_UNKNOWN) + 0 + else it.value + } + val presenceCount = subject.typeCountMap.entries.sumBy { + when (it.key.baseType) { + Attendance.TYPE_PRESENT, + Attendance.TYPE_PRESENT_CUSTOM, + Attendance.TYPE_BELATED, + Attendance.TYPE_BELATED_EXCUSED, + Attendance.TYPE_RELEASED -> if (it.key.isCounted) it.value else 0 + else -> 0 + } + } + totalCountSum += totalCount + presenceCountSum += presenceCount + + subject.percentage = if (totalCount == 0) + 0f + else + presenceCount.toFloat() / totalCount.toFloat() * 100f + + if (!false /* showPresenceInSubject */) + subject.items.removeAll { it.baseType == Attendance.TYPE_PRESENT } + } + + val typeCountMap = attendance + .groupBy { it.typeObject } + .map { it.key to it.value.size } + .sortedBy { it.first } + .toMap() + + val percentage = if (totalCountSum == 0) + 0f + else + presenceCountSum.toFloat() / totalCountSum.toFloat() * 100f + + launch { + b.attendanceBar.setAttendanceData(typeCountMap.map { manager.getAttendanceColor(it.key) to it.value }) + b.attendanceBar.isInvisible = typeCountMap.isEmpty() + + b.previewContainer.removeAllViews() + //val sum = typeCountMap.entries.sumBy { it.value }.toFloat() + typeCountMap.forEach { (type, count) -> + val layout = LinearLayout(activity) + val attendanceObject = Attendance( + profileId = 0, + id = 0, + baseType = type.baseType, + typeName = "", + typeShort = type.typeShort, + typeSymbol = type.typeSymbol, + typeColor = type.typeColor, + date = Date(0, 0, 0), + startTime = null, + semester = 0, + teacherId = 0, + subjectId = 0, + addedDate = 0 + ) + layout.addView(AttendanceView(activity, attendanceObject, manager)) + layout.addView(TextView(activity).also { + //it.setText(R.string.attendance_percentage_format, count/sum*100f) + it.text = count.toString() + it.setPadding(0, 0, 5.dp, 0) + }) + layout.setPadding(0, 8.dp, 0, 8.dp) + b.previewContainer.addView(layout) + } + + if (percentage == 0f) { + b.percentage.isInvisible = true + b.percentageCircle.isInvisible = true + } + else { + b.percentage.isVisible = true + b.percentageCircle.isVisible = true + b.percentage.setText(R.string.attendance_period_summary_format, percentage) + + val df = DecimalFormat("0.##") + b.percentageCircle.setProgressTextAdapter { value -> + df.format(value) + "%" + } + b.percentageCircle.maxProgress = 100.0 + animatePercentageIndicator(percentage.toDouble()) + } + } + + return items.toMutableList() + } + + private fun animatePercentageIndicator(targetProgress: Double) { + val startingProgress = b.percentageCircle.progress + val progressChange = targetProgress - startingProgress + + val a: Animation = object : Animation() { + override fun applyTransformation(interpolatedTime: Float, t: Transformation) { + val progress = startingProgress + (progressChange * interpolatedTime) + //if (interpolatedTime == 1f) + // progress = startingProgress + progressChange + + val color = ColorUtils.blendARGB(Color.RED, Color.GREEN, progress.toFloat() / 100.0f) + b.percentageCircle.progressColor = color + b.percentageCircle.setProgress(progress, 100.0) + } + + override fun willChangeBounds(): Boolean { + return false + } + } + a.duration = 1300 + a.interpolator = AccelerateDecelerateInterpolator() + b.percentageCircle.startAnimation(a) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceView.kt new file mode 100644 index 00000000..dfe20eda --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceView.kt @@ -0,0 +1,84 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-29. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance + +import android.annotation.SuppressLint +import android.content.Context +import android.text.TextUtils +import android.util.AttributeSet +import android.util.TypedValue +import android.view.Gravity +import android.view.View +import android.view.ViewGroup +import android.widget.LinearLayout +import androidx.appcompat.widget.AppCompatTextView +import androidx.core.graphics.ColorUtils +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.dp +import pl.szczodrzynski.edziennik.setTintColor +import pl.szczodrzynski.edziennik.utils.managers.AttendanceManager + +class AttendanceView : AppCompatTextView { + + @JvmOverloads + constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : super(context, attrs, defStyleAttr) + + constructor(context: Context, attendance: Attendance, manager: AttendanceManager) : this(context, null) { + setAttendance(attendance, manager, false) + } + + @SuppressLint("RestrictedApi") + fun setAttendance(attendance: Attendance?, manager: AttendanceManager, bigView: Boolean = false) { + if (attendance == null) { + visibility = View.GONE + return + } + visibility = View.VISIBLE + + val attendanceName = if (manager.useSymbols) + attendance.typeSymbol + else + attendance.typeShort + + val attendanceColor = manager.getAttendanceColor(attendance) + + text = when { + attendanceName.isBlank() -> " " + else -> attendanceName + } + + setTextColor(if (ColorUtils.calculateLuminance(attendanceColor) > 0.3) + 0xaa000000.toInt() + else + 0xccffffff.toInt()) + + setBackgroundResource(if (bigView) R.drawable.bg_rounded_8dp else R.drawable.bg_rounded_4dp) + background.setTintColor(attendanceColor) + gravity = Gravity.CENTER + + if (bigView) { + setTextSize(TypedValue.COMPLEX_UNIT_SP, 22f) + setAutoSizeTextTypeUniformWithConfiguration( + 14, + 32, + 1, + TypedValue.COMPLEX_UNIT_SP + ) + setPadding(2.dp, 2.dp, 2.dp, 2.dp) + } + else { + setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f) + setPadding(5.dp, 0, 5.dp, 0) + layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { + setMargins(0, 0, 5.dp, 0) + } + maxLines = 1 + ellipsize = TextUtils.TruncateAt.END + measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) + } + } +} + diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceCount.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceCount.kt new file mode 100644 index 00000000..c2595885 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceCount.kt @@ -0,0 +1,20 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-30. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.models + +class AttendanceCount { + var normalSum = 0f + var normalCount = 0 + var normalWeightedSum = 0f + var normalWeightedCount = 0f + + var pointSum = 0f + + var pointAvgSum = 0f + var pointAvgMax = 0f + + var normalAvg: Float? = null + var pointAvgPercent: Float? = null +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceDayRange.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceDayRange.kt new file mode 100644 index 00000000..e993d785 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceDayRange.kt @@ -0,0 +1,23 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-30. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.models + +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel +import pl.szczodrzynski.edziennik.utils.models.Date + +data class AttendanceDayRange( + var rangeStart: Date, + var rangeEnd: Date?, + override val items: MutableList = mutableListOf() +) : ExpandableItemModel(items) { + override var level = 1 + + var lastAddedDate = 0L + + var hasUnseen: Boolean = false + get() = field || items.any { it.baseType != Attendance.TYPE_PRESENT && !it.seen } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceEmpty.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceEmpty.kt new file mode 100644 index 00000000..46877f63 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceEmpty.kt @@ -0,0 +1,7 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-4. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.models + +class AttendanceEmpty diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceMonth.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceMonth.kt new file mode 100644 index 00000000..c6d14914 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceMonth.kt @@ -0,0 +1,26 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-30. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.models + +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.entity.AttendanceType +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel + +data class AttendanceMonth( + val year: Int, + val month: Int, + override val items: MutableList = mutableListOf() +) : ExpandableItemModel(items) { + override var level = 1 + + var lastAddedDate = 0L + + var hasUnseen: Boolean = false + get() = field || items.any { it.baseType != Attendance.TYPE_PRESENT && !it.seen } + + var typeCountMap: Map = mapOf() + var percentage: Float = 0f +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceSubject.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceSubject.kt new file mode 100644 index 00000000..b56cd62a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceSubject.kt @@ -0,0 +1,26 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-4. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.models + +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.entity.AttendanceType +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel + +data class AttendanceSubject( + val subjectId: Long, + val subjectName: String, + override val items: MutableList = mutableListOf() +) : ExpandableItemModel(items) { + override var level = 1 + + var lastAddedDate = 0L + + var hasUnseen: Boolean = false + get() = field || items.any { it.baseType != Attendance.TYPE_PRESENT && !it.seen } + + var typeCountMap: Map = mapOf() + var percentage: Float = 0f +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceTypeGroup.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceTypeGroup.kt new file mode 100644 index 00000000..d6b431ec --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/models/AttendanceTypeGroup.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-8. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.models + +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.entity.AttendanceType +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel + +data class AttendanceTypeGroup( + val type: AttendanceType, + override val items: MutableList = mutableListOf() +) : ExpandableItemModel(items) { + override var level = 1 + + var lastAddedDate = 0L + + var hasUnseen: Boolean = false + get() = field || items.any { it.baseType != Attendance.TYPE_PRESENT && !it.seen } + + var percentage: Float = 0f + var semesterCount: Int = 0 +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/AttendanceViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/AttendanceViewHolder.kt new file mode 100644 index 00000000..3e7a1d32 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/AttendanceViewHolder.kt @@ -0,0 +1,79 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-30. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.view.ContextThemeWrapper +import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.concat +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.databinding.AttendanceItemAttendanceBinding +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceDayRange +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceMonth +import pl.szczodrzynski.edziennik.ui.modules.grades.models.ExpandableItemModel +import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder +import pl.szczodrzynski.edziennik.utils.Themes +import pl.szczodrzynski.edziennik.utils.models.Week + +class AttendanceViewHolder( + inflater: LayoutInflater, + parent: ViewGroup, + val b: AttendanceItemAttendanceBinding = AttendanceItemAttendanceBinding.inflate(inflater, parent, false) +) : RecyclerView.ViewHolder(b.root), BindableViewHolder { + companion object { + private const val TAG = "AttendanceViewHolder" + } + + override fun onBind(activity: AppCompatActivity, app: App, item: AttendanceFull, position: Int, adapter: AttendanceAdapter) { + val manager = app.attendanceManager + val contextWrapper = ContextThemeWrapper(activity, Themes.appTheme) + + val bullet = " • " + + b.attendanceView.setAttendance(item, manager, bigView = true) + + b.type.text = item.typeName + b.subjectName.text = item.subjectLongName ?: item.lessonTopic + b.dateTime.text = listOf( + Week.getFullDayName(item.date.weekDay), + item.date.formattedStringShort, + item.startTime?.stringHM, + item.lessonNumber?.let { app.getString(R.string.attendance_lesson_number_format, it) } + ).concat(bullet) + + if (item.showAsUnseen == null) + item.showAsUnseen = !item.seen + + b.unread.isVisible = item.showAsUnseen == true + if (!item.seen) { + manager.markAsSeen(item) + + val container = adapter.items.firstOrNull { + it is ExpandableItemModel<*> && it.items.contains(item) + } as? ExpandableItemModel<*> ?: return + + var hasUnseen = true + if (container is AttendanceDayRange) { + hasUnseen = container.items.any { !it.seen } + container.hasUnseen = hasUnseen + } + if (container is AttendanceMonth) { + hasUnseen = container.items.any { !it.seen } + container.hasUnseen = hasUnseen + } + + // check if the unseen status has changed + if (!hasUnseen) { + adapter.notifyItemChanged(container) + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/DayRangeViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/DayRangeViewHolder.kt new file mode 100644 index 00000000..b42d5e16 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/DayRangeViewHolder.kt @@ -0,0 +1,72 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-30. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.view.ContextThemeWrapper +import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.concat +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.databinding.AttendanceItemDayRangeBinding +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter.Companion.STATE_CLOSED +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceView +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceDayRange +import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder +import pl.szczodrzynski.edziennik.utils.Themes + +class DayRangeViewHolder( + inflater: LayoutInflater, + parent: ViewGroup, + val b: AttendanceItemDayRangeBinding = AttendanceItemDayRangeBinding.inflate(inflater, parent, false) +) : RecyclerView.ViewHolder(b.root), BindableViewHolder { + companion object { + private const val TAG = "DayRangeViewHolder" + } + + override fun onBind(activity: AppCompatActivity, app: App, item: AttendanceDayRange, position: Int, adapter: AttendanceAdapter) { + val manager = app.attendanceManager + val contextWrapper = ContextThemeWrapper(activity, Themes.appTheme) + + b.title.text = listOf( + item.rangeStart.formattedString, + item.rangeEnd?.formattedString + ).concat(" - ") + + b.dropdownIcon.rotation = when (item.state) { + STATE_CLOSED -> 0f + else -> 180f + } + + b.unread.isVisible = item.hasUnseen + + b.previewContainer.visibility = if (item.state == STATE_CLOSED) View.VISIBLE else View.INVISIBLE + b.summaryContainer.visibility = if (item.state == STATE_CLOSED) View.INVISIBLE else View.VISIBLE + + b.previewContainer.removeAllViews() + + for (attendance in item.items) { + if (attendance.baseType == Attendance.TYPE_PRESENT_CUSTOM || attendance.baseType == Attendance.TYPE_UNKNOWN) + continue + b.previewContainer.addView(AttendanceView( + contextWrapper, + attendance, + manager + )) + } + if (item.items.isEmpty() || item.items.none { it.baseType != Attendance.TYPE_PRESENT_CUSTOM && it.baseType != Attendance.TYPE_UNKNOWN }) { + b.previewContainer.addView(TextView(contextWrapper).also { + it.setText(R.string.attendance_empty_text) + }) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/EmptyViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/EmptyViewHolder.kt new file mode 100644 index 00000000..37fe635c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/EmptyViewHolder.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-4. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.RecyclerView +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.databinding.AttendanceItemEmptyBinding +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceEmpty +import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder + +class EmptyViewHolder( + inflater: LayoutInflater, + parent: ViewGroup, + val b: AttendanceItemEmptyBinding = AttendanceItemEmptyBinding.inflate(inflater, parent, false) +) : RecyclerView.ViewHolder(b.root), BindableViewHolder { + companion object { + private const val TAG = "EmptyViewHolder" + } + + override fun onBind(activity: AppCompatActivity, app: App, item: AttendanceEmpty, position: Int, adapter: AttendanceAdapter) { + + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/MonthViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/MonthViewHolder.kt new file mode 100644 index 00000000..71c139ac --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/MonthViewHolder.kt @@ -0,0 +1,99 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-30. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder + +import android.view.LayoutInflater +import android.view.ViewGroup +import android.widget.LinearLayout +import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.view.ContextThemeWrapper +import androidx.core.view.isInvisible +import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.databinding.AttendanceItemMonthBinding +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter.Companion.STATE_CLOSED +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceView +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceMonth +import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder +import pl.szczodrzynski.edziennik.utils.Themes +import pl.szczodrzynski.edziennik.utils.models.Date + +class MonthViewHolder( + inflater: LayoutInflater, + parent: ViewGroup, + val b: AttendanceItemMonthBinding = AttendanceItemMonthBinding.inflate(inflater, parent, false) +) : RecyclerView.ViewHolder(b.root), BindableViewHolder { + companion object { + private const val TAG = "MonthViewHolder" + } + + override fun onBind(activity: AppCompatActivity, app: App, item: AttendanceMonth, position: Int, adapter: AttendanceAdapter) { + val manager = app.attendanceManager + val contextWrapper = ContextThemeWrapper(activity, Themes.appTheme) + + b.title.text = listOf( + app.resources.getStringArray(R.array.material_calendar_months_array).getOrNull(item.month - 1)?.fixName(), + item.year.toString() + ).concat(" ") + + b.dropdownIcon.rotation = when (item.state) { + STATE_CLOSED -> 0f + else -> 180f + } + + b.unread.isVisible = item.hasUnseen + + b.attendanceBar.setAttendanceData(item.typeCountMap.map { manager.getAttendanceColor(it.key) to it.value }) + + b.previewContainer.isInvisible = item.state != STATE_CLOSED + b.summaryContainer.isInvisible = item.state == STATE_CLOSED + b.percentage.isVisible = item.state == STATE_CLOSED + + b.previewContainer.removeAllViews() + + val sum = item.typeCountMap.entries.sumBy { it.value }.toFloat() + item.typeCountMap.forEach { (type, count) -> + val layout = LinearLayout(contextWrapper) + val attendance = Attendance( + profileId = 0, + id = 0, + baseType = type.baseType, + typeName = "", + typeShort = type.typeShort, + typeSymbol = type.typeSymbol, + typeColor = type.typeColor, + date = Date(0, 0, 0), + startTime = null, + semester = 0, + teacherId = 0, + subjectId = 0, + addedDate = 0 + ) + layout.addView(AttendanceView(contextWrapper, attendance, manager)) + layout.addView(TextView(contextWrapper).also { + //it.setText(R.string.attendance_percentage_format, count/sum*100f) + it.text = count.toString() + it.setPadding(0, 0, 5.dp, 0) + }) + layout.setPadding(0, 8.dp, 0, 0) + b.previewContainer.addView(layout) + } + + if (item.percentage == 0f) { + b.percentage.isVisible = false + b.percentage.text = null + b.summaryContainer.isVisible = false + b.summaryContainer.text = null + } + else { + b.percentage.setText(R.string.attendance_percentage_format, item.percentage) + b.summaryContainer.setText(R.string.attendance_period_summary_format, item.percentage) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/SubjectViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/SubjectViewHolder.kt new file mode 100644 index 00000000..e439111d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/SubjectViewHolder.kt @@ -0,0 +1,57 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-4. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.view.ContextThemeWrapper +import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.databinding.AttendanceItemSubjectBinding +import pl.szczodrzynski.edziennik.setText +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter.Companion.STATE_CLOSED +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceSubject +import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder +import pl.szczodrzynski.edziennik.utils.Themes + +class SubjectViewHolder( + inflater: LayoutInflater, + parent: ViewGroup, + val b: AttendanceItemSubjectBinding = AttendanceItemSubjectBinding.inflate(inflater, parent, false) +) : RecyclerView.ViewHolder(b.root), BindableViewHolder { + companion object { + private const val TAG = "SubjectViewHolder" + } + + override fun onBind(activity: AppCompatActivity, app: App, item: AttendanceSubject, position: Int, adapter: AttendanceAdapter) { + val manager = app.attendanceManager + val contextWrapper = ContextThemeWrapper(activity, Themes.appTheme) + + b.title.text = item.subjectName + + b.dropdownIcon.rotation = when (item.state) { + STATE_CLOSED -> 0f + else -> 180f + } + + b.unread.isVisible = item.hasUnseen + + b.attendanceBar.setAttendanceData(item.typeCountMap.map { manager.getAttendanceColor(it.key) to it.value }) + + b.percentage.isVisible = true + + if (item.percentage == 0f) { + b.percentage.isVisible = false + b.percentage.text = null + } + else { + b.percentage.setText(R.string.attendance_percentage_format, item.percentage) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/TypeViewHolder.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/TypeViewHolder.kt new file mode 100644 index 00000000..a2f8b689 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/viewholder/TypeViewHolder.kt @@ -0,0 +1,69 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-8. + */ + +package pl.szczodrzynski.edziennik.ui.modules.attendance.viewholder + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.view.ContextThemeWrapper +import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.concat +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.databinding.AttendanceItemTypeBinding +import pl.szczodrzynski.edziennik.ui.modules.attendance.AttendanceAdapter +import pl.szczodrzynski.edziennik.ui.modules.attendance.models.AttendanceTypeGroup +import pl.szczodrzynski.edziennik.ui.modules.grades.viewholder.BindableViewHolder +import pl.szczodrzynski.edziennik.utils.Themes +import pl.szczodrzynski.edziennik.utils.models.Date + +class TypeViewHolder( + inflater: LayoutInflater, + parent: ViewGroup, + val b: AttendanceItemTypeBinding = AttendanceItemTypeBinding.inflate(inflater, parent, false) +) : RecyclerView.ViewHolder(b.root), BindableViewHolder { + companion object { + private const val TAG = "TypeViewHolder" + } + + override fun onBind(activity: AppCompatActivity, app: App, item: AttendanceTypeGroup, position: Int, adapter: AttendanceAdapter) { + val manager = app.attendanceManager + val contextWrapper = ContextThemeWrapper(activity, Themes.appTheme) + + val type = item.type + b.title.text = type.typeName + + b.dropdownIcon.rotation = when (item.state) { + AttendanceAdapter.STATE_CLOSED -> 0f + else -> 180f + } + + b.unread.isVisible = item.hasUnseen + + b.details.text = listOf( + app.getString(R.string.attendance_percentage_format, item.percentage), + app.getString(R.string.attendance_type_yearly_format, item.items.size), + app.getString(R.string.attendance_type_semester_format, item.semesterCount) + ).concat(" • ") + + b.type.setAttendance(Attendance( + profileId = 0, + id = 0, + baseType = type.baseType, + typeName = "", + typeShort = type.typeShort, + typeSymbol = type.typeSymbol, + typeColor = type.typeColor, + date = Date(0, 0, 0), + startTime = null, + semester = 0, + teacherId = 0, + subjectId = 0, + addedDate = 0 + ), manager, bigView = false) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/BuildInvalidActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/BuildInvalidActivity.kt new file mode 100644 index 00000000..766c79ad --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/BuildInvalidActivity.kt @@ -0,0 +1,33 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-27. + */ + +package pl.szczodrzynski.edziennik.ui.modules.base + +import android.graphics.Color +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.isVisible +import com.mikepenz.iconics.utils.colorInt +import pl.szczodrzynski.edziennik.databinding.ActivityBuildInvalidBinding +import pl.szczodrzynski.edziennik.onClick +import pl.szczodrzynski.edziennik.utils.Themes + +class BuildInvalidActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setTheme(Themes.themeInt) + val b = ActivityBuildInvalidBinding.inflate(layoutInflater, null, false) + setContentView(b.root) + + setSupportActionBar(b.toolbar) + + b.icon.icon?.colorInt = intent.getIntExtra("color", Color.GREEN) + b.message.text = intent.getStringExtra("message") + b.closeButton.isVisible = !intent.getBooleanExtra("isCritical", true) + b.closeButton.onClick { + finish() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.java deleted file mode 100644 index f159282a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.java +++ /dev/null @@ -1,180 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.modules.base; - -/* - * Copyright 2014-2017 Eduard Ereza Martínez - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import android.annotation.SuppressLint; -import android.content.ClipData; -import android.content.ClipboardManager; -import android.content.Intent; -import android.os.Build; -import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import android.text.Html; -import android.util.Base64; -import android.view.View; -import android.widget.Button; -import android.widget.Toast; - -import com.afollestad.materialdialogs.MaterialDialog; - -import cat.ereza.customactivityoncrash.CustomActivityOnCrash; -import cat.ereza.customactivityoncrash.config.CaocConfig; -import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.BuildConfig; -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.network.ServerRequest; -import pl.szczodrzynski.edziennik.utils.Themes; - -import static pl.szczodrzynski.edziennik.App.APP_URL; -import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_ENABLED; - -public final class CrashActivity extends AppCompatActivity { - - private App app; - - @SuppressLint("PrivateResource") - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - this.app = (App)getApplication(); - setTheme(Themes.INSTANCE.getAppTheme()); - - setContentView(R.layout.activity_crash); - - final CaocConfig config = CustomActivityOnCrash.getConfigFromIntent(getIntent()); - - if (config == null) { - //This should never happen - Just finish the activity to avoid a recursive crash. - finish(); - return; - } - - //Close/restart button logic: - //If a class if set, use restart. - //Else, use close and just finish the app. - //It is recommended that you follow this logic if implementing a custom error activity. - Button restartButton = findViewById(R.id.crash_restart_btn); - restartButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - CustomActivityOnCrash.restartApplication(CrashActivity.this, config); - } - }); - - - Button devMessageButton = findViewById(R.id.crash_dev_message_btn); - devMessageButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent i = new Intent(CrashActivity.this, CrashGtfoActivity.class); - startActivity(i); - } - }); - - final Button reportButton = findViewById(R.id.crash_report_btn); - reportButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!app.networkUtils.isOnline()) - { - new MaterialDialog.Builder(CrashActivity.this) - .title(R.string.network_you_are_offline_title) - .content(R.string.network_you_are_offline_text) - .positiveText(R.string.ok) - .show(); - } - else - { - //app.networkUtils.setSelfSignedSSL(CrashActivity.this, null); - new ServerRequest(app, app.requestScheme + APP_URL + "main.php?report", "CrashActivity") - .setBodyParameter("base64_encoded", Base64.encodeToString(getErrorString(getIntent(), true).getBytes(), Base64.DEFAULT)) - .run((e, result) -> { - if (result != null) - { - if (result.get("success").getAsBoolean()) { - Toast.makeText(CrashActivity.this, getString(R.string.crash_report_sent), Toast.LENGTH_SHORT).show(); - reportButton.setEnabled(false); - reportButton.setTextColor(getResources().getColor(android.R.color.darker_gray)); - } - else { - Toast.makeText(CrashActivity.this, getString(R.string.crash_report_cannot_send) + ": " + result.get("reason").getAsString(), Toast.LENGTH_LONG).show(); - } - } - else - { - Toast.makeText(CrashActivity.this, getString(R.string.crash_report_cannot_send)+" JsonObject equals null", Toast.LENGTH_LONG).show(); - } - }); - } - } - }); - - Button moreInfoButton = findViewById(R.id.crash_details_btn); - moreInfoButton.setOnClickListener(v -> new MaterialDialog.Builder(CrashActivity.this) - .title(R.string.crash_details) - .content(Html.fromHtml(getErrorString(getIntent(), false))) - .typeface(null, "RobotoMono-Regular.ttf") - .positiveText(R.string.close) - .neutralText(R.string.copy_to_clipboard) - .onNeutral((dialog, which) -> copyErrorToClipboard()) - .show()); - - String errorInformation = CustomActivityOnCrash.getAllErrorDetailsFromIntent(CrashActivity.this, getIntent()); - if (errorInformation.contains("MANUAL CRASH")) - { - findViewById(R.id.crash_notice).setVisibility(View.GONE); - findViewById(R.id.crash_report_btn).setVisibility(View.GONE); - findViewById(R.id.crash_feature).setVisibility(View.VISIBLE); - } - else - { - findViewById(R.id.crash_notice).setVisibility(View.VISIBLE); - findViewById(R.id.crash_report_btn).setVisibility(View.VISIBLE); - findViewById(R.id.crash_feature).setVisibility(View.GONE); - } - } - - private String getErrorString(Intent intent, boolean plain) { - // build a string containing the stack trace and the device name + user's registration data - String contentPlain = "Crash report:\n\n"+CustomActivityOnCrash.getStackTraceFromIntent(intent); - String content = ""+contentPlain+""; - content = content.replaceAll(getPackageName(), ""+getPackageName()+""); - content = content.replaceAll("\n", "
    "); - - contentPlain += "\n"+Build.MANUFACTURER+"\n"+Build.BRAND+"\n"+Build.MODEL+"\n"+Build.DEVICE+"\n"; - if (app.profile != null && app.profile.getRegistration() == REGISTRATION_ENABLED) { - contentPlain += "U: "+app.profile.getUsernameId()+"\nS: "+ app.profile.getStudentNameLong() +"\n"; - } - contentPlain += BuildConfig.VERSION_NAME+" "+BuildConfig.BUILD_TYPE; - - return plain ? contentPlain : content; - } - - private void copyErrorToClipboard() { - String errorInformation = CustomActivityOnCrash.getAllErrorDetailsFromIntent(CrashActivity.this, getIntent()); - - ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); - - //Are there any devices without clipboard...? - if (clipboard != null) { - ClipData clip = ClipData.newPlainText(getString(R.string.customactivityoncrash_error_activity_error_details_clipboard_label), errorInformation); - clipboard.setPrimaryClip(clip); - Toast.makeText(CrashActivity.this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show(); - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.kt new file mode 100644 index 00000000..0b39b913 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/base/CrashActivity.kt @@ -0,0 +1,158 @@ +package pl.szczodrzynski.edziennik.ui.modules.base + +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.content.Intent +import android.os.Build +import android.os.Bundle +import android.text.Html +import android.view.View +import android.widget.Button +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import cat.ereza.customactivityoncrash.CustomActivityOnCrash +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.* +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.BuildConfig +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.api.ERROR_APP_CRASH +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi +import pl.szczodrzynski.edziennik.data.api.szkolny.request.ErrorReportRequest +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.utils.Themes.appTheme +import kotlin.coroutines.CoroutineContext + +/* + * Copyright 2014-2017 Eduard Ereza Martínez + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +class CrashActivity : AppCompatActivity(), CoroutineScope { + companion object { + const val TAG = "CrashActivity" + } + + private val app by lazy { application as App } + private val api by lazy { SzkolnyApi(app) } + + private var job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setTheme(appTheme) + setContentView(R.layout.activity_crash) + val config = CustomActivityOnCrash.getConfigFromIntent(intent) + if (config == null) { //This should never happen - Just finish the activity to avoid a recursive crash. + finish() + return + } + + //Close/restart button logic: + //If a class if set, use restart. + //Else, use close and just finish the app. + //It is recommended that you follow this logic if implementing a custom error activity. + val restartButton = findViewById
    • ]]>
  • """.toRegex(DOT_MATCHES_ALL) + } + val EDUDZIENNIK_CLASS_DETAIL_ID by lazy { + """(.*?)""".toRegex(DOT_MATCHES_ALL) + } + + val EDUDZIENNIK_TEACHERS by lazy { + """
    .*?

    (.+?) (.+?)

    """.toRegex(DOT_MATCHES_ALL) + } + + + + + val LINKIFY_DATE_YMD by lazy { + """(1\d{3}|20\d{2})[\-./](1[0-2]|0?\d)[\-./]([1-2]\d|3[0-1]|0?\d)""".toRegex() + } + val LINKIFY_DATE_DMY by lazy { + """(?>? = null, onlyEndpoints: List? = null, arguments: JsonObject? = null) = EdziennikTask(profileId, SyncProfileRequest(viewIds, onlyEndpoints, arguments)) + fun syncProfileList(profileList: List) = EdziennikTask(-1, SyncProfileListRequest(profileList)) + fun messageGet(profileId: Int, message: MessageFull) = EdziennikTask(profileId, MessageGetRequest(message)) + fun messageSend(profileId: Int, recipients: List, subject: String, text: String) = EdziennikTask(profileId, MessageSendRequest(recipients, subject, text)) + fun announcementsRead(profileId: Int) = EdziennikTask(profileId, AnnouncementsReadRequest()) + fun announcementGet(profileId: Int, announcement: AnnouncementFull) = EdziennikTask(profileId, AnnouncementGetRequest(announcement)) + fun attachmentGet(profileId: Int, owner: Any, attachmentId: Long, attachmentName: String) = EdziennikTask(profileId, AttachmentGetRequest(owner, attachmentId, attachmentName)) + fun recipientListGet(profileId: Int) = EdziennikTask(profileId, RecipientListGetRequest()) + fun eventGet(profileId: Int, event: EventFull) = EdziennikTask(profileId, EventGetRequest(event)) + } + + private lateinit var loginStore: LoginStore + + override fun prepare(app: App) { + if (request is FirstLoginRequest) { + // get the requested profile and login store + this.profile = null + loginStore = request.loginStore + // save the profile ID and name as the current task's + taskName = app.getString(R.string.edziennik_notification_api_first_login_title) + } else { + // get the requested profile and login store + val profile = app.db.profileDao().getByIdNow(profileId) ?: return + this.profile = profile + val loginStore = app.db.loginStoreDao().getByIdNow(profile.loginStoreId) ?: return + this.loginStore = loginStore + // save the profile ID and name as the current task's + taskName = app.getString(R.string.edziennik_notification_api_sync_title_format, profile.name) + } + EdziennikTask.profile = this.profile + EdziennikTask.loginStore = this.loginStore + } + + private var edziennikInterface: EdziennikInterface? = null + + internal fun run(app: App, taskCallback: EdziennikCallback) { + profile?.let { profile -> + if (profile.archived) { + d(TAG, "The profile $profileId is archived") + taskCallback.onError(ApiError(TAG, ERROR_PROFILE_ARCHIVED)) + return + } + else if (profile.shouldArchive()) { + d(TAG, "The profile $profileId's year ended on ${profile.dateYearEnd}, archiving") + ProfileArchiver(app, profile) + } + if (profile.isBeforeYear()) { + d(TAG, "The profile $profileId's school year has not started yet; aborting sync") + cancel() + taskCallback.onCompleted() + return + } + + val error = app.availabilityManager.check(profile) + when (error?.type) { + Type.NOT_AVAILABLE -> { + if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) { + EventBus.getDefault().postSticky(RegisterAvailabilityEvent()) + } + cancel() + taskCallback.onCompleted() + return + } + Type.API_ERROR -> { + taskCallback.onError(error.apiError!!) + return + } + else -> return@let + } + } + + edziennikInterface = when (loginStore.type) { + LOGIN_TYPE_LIBRUS -> Librus(app, profile, loginStore, taskCallback) + LOGIN_TYPE_MOBIDZIENNIK -> Mobidziennik(app, profile, loginStore, taskCallback) + LOGIN_TYPE_VULCAN -> Vulcan(app, profile, loginStore, taskCallback) + LOGIN_TYPE_EDUDZIENNIK -> Edudziennik(app, profile, loginStore, taskCallback) + LOGIN_TYPE_PODLASIE -> Podlasie(app, profile, loginStore, taskCallback) + LOGIN_TYPE_TEMPLATE -> Template(app, profile, loginStore, taskCallback) + else -> null + } + if (edziennikInterface == null) { + return + } + + when (request) { + is SyncProfileRequest -> edziennikInterface?.sync( + featureIds = request.viewIds?.flatMap { Features.getIdsByView(it.first, it.second) } + ?: Features.getAllIds(), + viewId = request.viewIds?.get(0)?.first, + onlyEndpoints = request.onlyEndpoints, + arguments = request.arguments) + is MessageGetRequest -> edziennikInterface?.getMessage(request.message) + is MessageSendRequest -> edziennikInterface?.sendMessage(request.recipients, request.subject, request.text) + is FirstLoginRequest -> edziennikInterface?.firstLogin() + is AnnouncementsReadRequest -> edziennikInterface?.markAllAnnouncementsAsRead() + is AnnouncementGetRequest -> edziennikInterface?.getAnnouncement(request.announcement) + is AttachmentGetRequest -> edziennikInterface?.getAttachment(request.owner, request.attachmentId, request.attachmentName) + is RecipientListGetRequest -> edziennikInterface?.getRecipientList() + is EventGetRequest -> edziennikInterface?.getEvent(request.event) + } + } + + override fun cancel() { + d(TAG, "Task ${toString()} cancelling...") + edziennikInterface?.cancel() + } + + override fun toString(): String { + return "EdziennikTask(profileId=$profileId, request=$request, edziennikInterface=$edziennikInterface)" + } + + data class FirstLoginRequest(val loginStore: LoginStore) + class SyncRequest + data class SyncProfileRequest(val viewIds: List>? = null, val onlyEndpoints: List? = null, val arguments: JsonObject? = null) + data class SyncProfileListRequest(val profileList: List) + data class MessageGetRequest(val message: MessageFull) + data class MessageSendRequest(val recipients: List, val subject: String, val text: String) + class AnnouncementsReadRequest + data class AnnouncementGetRequest(val announcement: AnnouncementFull) + data class AttachmentGetRequest(val owner: Any, val attachmentId: Long, val attachmentName: String) + class RecipientListGetRequest + data class EventGetRequest(val event: EventFull) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/ProfileArchiver.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/ProfileArchiver.kt new file mode 100644 index 00000000..15da9765 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/ProfileArchiver.kt @@ -0,0 +1,97 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-8-25. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik + +import android.content.Intent +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.Intent +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.utils.Utils.d +import pl.szczodrzynski.edziennik.utils.models.Date + +class ProfileArchiver(val app: App, val profile: Profile) { + companion object { + private const val TAG = "ProfileArchiver" + } + + init { + if (profile.archiveId == null) + profile.archiveId = profile.id + d(TAG, "Processing ${profile.name}#${profile.id}, archiveId = ${profile.archiveId}") + + profile.archived = true + app.db.profileDao().add(profile) + //app.db.metadataDao().setAllSeen(profile.id, true) + app.db.notificationDao().clear(profile.id) + app.db.endpointTimerDao().clear(profile.id) + d(TAG, "Archived profile ${profile.id} saved") + profile.archived = false + + // guess the nearest school year + val today = Date.getToday() + profile.studentSchoolYearStart = when { + today.month <= profile.dateYearEnd.month -> today.year - 1 + else -> today.year + } + + // set default semester dates + profile.dateSemester1Start = Date(profile.studentSchoolYearStart, 9, 1) + profile.dateSemester2Start = Date(profile.studentSchoolYearStart + 1, 2, 1) + profile.dateYearEnd = Date(profile.studentSchoolYearStart + 1, 6, 30) + + val oldId = profile.id + val newId = (app.db.profileDao().lastId ?: profile.id) + 1 + profile.id = newId + profile.subname = "Nowy rok szkolny - ${profile.studentSchoolYearStart}" + profile.studentClassName = null + + d(TAG, "New profile ID for ${profile.name}: ${profile.id}") + + when (profile.loginStoreType) { + LOGIN_TYPE_LIBRUS -> { + profile.removeStudentData("isPremium") + profile.removeStudentData("pushDeviceId") + profile.removeStudentData("startPointsSemester1") + profile.removeStudentData("startPointsSemester2") + profile.removeStudentData("enablePointGrades") + profile.removeStudentData("enableDescriptiveGrades") + } + LOGIN_TYPE_MOBIDZIENNIK -> { + + } + LOGIN_TYPE_VULCAN -> { + // DataVulcan.isApiLoginValid() returns false so it will update the semester + profile.removeStudentData("currentSemesterEndDate") + profile.removeStudentData("studentSemesterId") + profile.removeStudentData("studentSemesterNumber") + profile.removeStudentData("semester1Id") + profile.removeStudentData("semester2Id") + profile.removeStudentData("studentClassId") + } + LOGIN_TYPE_IDZIENNIK -> { + profile.removeStudentData("schoolYearId") + } + LOGIN_TYPE_EDUDZIENNIK -> { + + } + LOGIN_TYPE_PODLASIE -> { + + } + } + + d(TAG, "Processed student data: ${profile.studentData}") + + app.db.profileDao().add(profile) + + if (app.profileId == oldId) { + val intent = Intent( + Intent.ACTION_MAIN, + "profileId" to newId + ) + app.sendBroadcast(intent) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/DataEdudziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/DataEdudziennik.kt new file mode 100644 index 00000000..49a9d4a0 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/DataEdudziennik.kt @@ -0,0 +1,122 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-22 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik + +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_EDUDZIENNIK_WEB +import pl.szczodrzynski.edziennik.data.api.models.Data +import pl.szczodrzynski.edziennik.data.db.entity.* + +/** + * Use http://patorjk.com/software/taag/#p=display&f=Big for the ascii art + * + * Use https://codepen.io/kubasz/pen/RwwwbGN to easily generate the student data getters/setters + */ +class DataEdudziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) { + + fun isWebLoginValid() = webSessionIdExpiryTime-30 > currentTimeUnix() && webSessionId.isNotNullNorEmpty() + + override fun satisfyLoginMethods() { + loginMethods.clear() + if (isWebLoginValid()) { + loginMethods += LOGIN_METHOD_EDUDZIENNIK_WEB + } + } + + override fun generateUserCode() = "$schoolName:$loginEmail:${studentId?.crc32()}" + + private var mLoginEmail: String? = null + var loginEmail: String? + get() { mLoginEmail = mLoginEmail ?: loginStore.getLoginData("email", null); return mLoginEmail } + set(value) { loginStore.putLoginData("email", value); mLoginEmail = value } + + private var mLoginPassword: String? = null + var loginPassword: String? + get() { mLoginPassword = mLoginPassword ?: loginStore.getLoginData("password", null); return mLoginPassword } + set(value) { loginStore.putLoginData("password", value); mLoginPassword = value } + + private var mStudentId: String? = null + var studentId: String? + get() { mStudentId = mStudentId ?: profile?.getStudentData("studentId", null); return mStudentId } + set(value) { profile?.putStudentData("studentId", value) ?: return; mStudentId = value } + + private var mSchoolId: String? = null + var schoolId: String? + get() { mSchoolId = mSchoolId ?: profile?.getStudentData("schoolId", null); return mSchoolId } + set(value) { profile?.putStudentData("schoolId", value) ?: return; mSchoolId = value } + + private var mClassId: String? = null + var classId: String? + get() { mClassId = mClassId ?: profile?.getStudentData("classId", null); return mClassId } + set(value) { profile?.putStudentData("classId", value) ?: return; mClassId = value } + + /* __ __ _ + \ \ / / | | + \ \ /\ / /__| |__ + \ \/ \/ / _ \ '_ \ + \ /\ / __/ |_) | + \/ \/ \___|_._*/ + private var mWebSessionId: String? = null + var webSessionId: String? + get() { mWebSessionId = mWebSessionId ?: loginStore.getLoginData("webSessionId", null); return mWebSessionId } + set(value) { loginStore.putLoginData("webSessionId", value); mWebSessionId = value } + + private var mWebSessionIdExpiryTime: Long? = null + var webSessionIdExpiryTime: Long + get() { mWebSessionIdExpiryTime = mWebSessionIdExpiryTime ?: loginStore.getLoginData("webSessionIdExpiryTime", 0L); return mWebSessionIdExpiryTime ?: 0L } + set(value) { loginStore.putLoginData("webSessionIdExpiryTime", value); mWebSessionIdExpiryTime = value } + + /* ____ _ _ + / __ \| | | | + | | | | |_| |__ ___ _ __ + | | | | __| '_ \ / _ \ '__| + | |__| | |_| | | | __/ | + \____/ \__|_| |_|\___|*/ + private var mCurrentSemester: Int? = null + var currentSemester: Int + get() { mCurrentSemester = mCurrentSemester ?: profile?.getStudentData("currentSemester", 1); return mCurrentSemester ?: 1 } + set(value) { profile?.putStudentData("currentSemester", value) ?: return; mCurrentSemester = value } + + private var mSchoolName: String? = null + var schoolName: String? + get() { mSchoolName = mSchoolName ?: profile?.getStudentData("schoolName", null); return mSchoolName } + set(value) { profile?.putStudentData("schoolName", value) ?: return; mSchoolName = value } + + val studentEndpoint: String + get() = "Students/$studentId/" + + val schoolEndpoint: String + get() = "Schools/$schoolId/" + + val classStudentEndpoint: String + get() = "Class/$studentId/" + + val schoolClassEndpoint: String + get() = "Schools/$classId/" + + val studentAndClassEndpoint: String + get() = "Students/$studentId/Klass/$classId/" + + val studentAndClassesEndpoint: String + get() = "Students/$studentId/Classes/$classId/" + + val timetableEndpoint: String + get() = "Plan/$studentId/" + + val studentAndTeacherClassEndpoint: String + get() = "Students/$studentId/Teachers/$classId/" + + val courseStudentEndpoint: String + get() = "Course/$studentId/" + + fun getEventType(longId: String, name: String): EventType { + val id = longId.crc16().toLong() + return eventTypes.singleOrNull { it.id == id } ?: run { + val eventType = EventType(profileId, id, name, colorFromName(name)) + eventTypes.put(id, eventType) + eventType + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt new file mode 100644 index 00000000..23d9d3b1 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/Edudziennik.kt @@ -0,0 +1,142 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-22 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik + +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikData +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web.EdudziennikWebGetAnnouncement +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web.EdudziennikWebGetHomework +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.firstlogin.EdudziennikFirstLogin +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLogin +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb +import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback +import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.data.db.full.MessageFull +import pl.szczodrzynski.edziennik.utils.Utils.d + +class Edudziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface { + companion object { + private const val TAG = "Edudziennik" + } + + val internalErrorList = mutableListOf() + val data: DataEdudziennik + private var afterLogin: (() -> Unit)? = null + + init { + data = DataEdudziennik(app, profile, loginStore).apply { + callback = wrapCallback(this@Edudziennik.callback) + satisfyLoginMethods() + } + } + + private fun completed() { + data.saveData() + callback.onCompleted() + } + + /* _______ _ _ _ _ _ + |__ __| | /\ | | (_) | | | + | | | |__ ___ / \ | | __ _ ___ _ __ _| |_| |__ _ __ ___ + | | | '_ \ / _ \ / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \ + | | | | | | __/ / ____ \| | (_| | (_) | | | | |_| | | | | | | | | + |_| |_| |_|\___| /_/ \_\_|\__, |\___/|_| |_|\__|_| |_|_| |_| |_| + __/ | + |__*/ + override fun sync(featureIds: List, viewId: Int?, onlyEndpoints: List?, arguments: JsonObject?) { + data.arguments = arguments + data.prepare(edudziennikLoginMethods, EdudziennikFeatures, featureIds, viewId, onlyEndpoints) + login() + } + + private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) { + d(TAG, "Trying to login with ${data.targetLoginMethodIds}") + if (internalErrorList.isNotEmpty()) { + d(TAG, " - Internal errors:") + internalErrorList.forEach { d(TAG, " - code $it") } + } + loginMethodId?.let { data.prepareFor(edudziennikLoginMethods, it) } + afterLogin?.let { this.afterLogin = it } + EdudziennikLogin(data) { + data() + } + } + + private fun data() { + d(TAG, "Endpoint IDs: ${data.targetEndpointIds}") + if (internalErrorList.isNotEmpty()) { + d(TAG, " - Internal errors:") + internalErrorList.forEach { d(TAG, " - code $it") } + } + afterLogin?.invoke() ?: EdudziennikData(data) { + completed() + } + } + + override fun getMessage(message: MessageFull) {} + override fun sendMessage(recipients: List, subject: String, text: String) {} + override fun markAllAnnouncementsAsRead() {} + + override fun getAnnouncement(announcement: AnnouncementFull) { + EdudziennikLoginWeb(data) { + EdudziennikWebGetAnnouncement(data, announcement) { + completed() + } + } + } + + override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) {} + override fun getRecipientList() {} + + override fun getEvent(eventFull: EventFull) { + EdudziennikLoginWeb(data) { + EdudziennikWebGetHomework(data, eventFull) { + completed() + } + } + } + + override fun firstLogin() { EdudziennikFirstLogin(data) { completed() } } + override fun cancel() { + d(TAG, "Cancelled") + data.cancel() + } + + private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback { + return object : EdziennikCallback { + override fun onCompleted() { callback.onCompleted() } + override fun onProgress(step: Float) { callback.onProgress(step) } + override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) } + override fun onError(apiError: ApiError) { + if (apiError.errorCode in internalErrorList) { + // finish immediately if the same error occurs twice during the same sync + callback.onError(apiError) + return + } + internalErrorList.add(apiError.errorCode) + when (apiError.errorCode) { + ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED -> { + login() + } + ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID -> { + login() + } + ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS -> { + data() + } + else -> callback.onError(apiError) + } + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/EdudziennikFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/EdudziennikFeatures.kt new file mode 100644 index 00000000..c3fd17ed --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/EdudziennikFeatures.kt @@ -0,0 +1,74 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-23 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik + +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.models.Feature + +const val ENDPOINT_EDUDZIENNIK_WEB_START = 1000 +const val ENDPOINT_EDUDZIENNIK_WEB_TEACHERS = 1001 +const val ENDPOINT_EDUDZIENNIK_WEB_GRADES = 1011 +const val ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE = 1012 +const val ENDPOINT_EDUDZIENNIK_WEB_EXAMS = 1013 +const val ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE = 1014 +const val ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS = 1015 +const val ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK = 1016 +const val ENDPOINT_EDUDZIENNIK_WEB_EVENTS = 1017 +const val ENDPOINT_EDUDZIENNIK_WEB_NOTES = 1018 +const val ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER = 1030 + +val EdudziennikFeatures = listOf( + /* School and team info and subjects */ + Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_STUDENT_INFO, listOf( + ENDPOINT_EDUDZIENNIK_WEB_START to LOGIN_METHOD_EDUDZIENNIK_WEB + ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)), + + /* Teachers */ + Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_TEACHERS, listOf( + ENDPOINT_EDUDZIENNIK_WEB_TEACHERS to LOGIN_METHOD_EDUDZIENNIK_WEB + ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)), + + /* Timetable */ + Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_TIMETABLE, listOf( + ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE to LOGIN_METHOD_EDUDZIENNIK_WEB + ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)), + + /* Grades */ + Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_GRADES, listOf( + ENDPOINT_EDUDZIENNIK_WEB_GRADES to LOGIN_METHOD_EDUDZIENNIK_WEB + ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)), + + /* Agenda */ + Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_AGENDA, listOf( + ENDPOINT_EDUDZIENNIK_WEB_EXAMS to LOGIN_METHOD_EDUDZIENNIK_WEB, + ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK to LOGIN_METHOD_EDUDZIENNIK_WEB, + ENDPOINT_EDUDZIENNIK_WEB_EVENTS to LOGIN_METHOD_EDUDZIENNIK_WEB + ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)), + + /* Homework */ + Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_HOMEWORK, listOf( + ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK to LOGIN_METHOD_EDUDZIENNIK_WEB + ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)), + + /* Behaviour */ + Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_BEHAVIOUR, listOf( + ENDPOINT_EDUDZIENNIK_WEB_NOTES to LOGIN_METHOD_EDUDZIENNIK_WEB + ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)), + + /* Attendance */ + Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_ATTENDANCE, listOf( + ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_EDUDZIENNIK_WEB + ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)), + + /* Announcements */ + Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_ANNOUNCEMENTS, listOf( + ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS to LOGIN_METHOD_EDUDZIENNIK_WEB + ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)), + + /* Lucky number */ + Feature(LOGIN_TYPE_EDUDZIENNIK, FEATURE_LUCKY_NUMBER, listOf( + ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER to LOGIN_METHOD_EDUDZIENNIK_WEB + ), listOf(LOGIN_METHOD_EDUDZIENNIK_WEB)) +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikData.kt new file mode 100644 index 00000000..7eb58d1c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikData.kt @@ -0,0 +1,88 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-22 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data + +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web.* +import pl.szczodrzynski.edziennik.utils.Utils + +class EdudziennikData(val data: DataEdudziennik, val onSuccess: () -> Unit) { + companion object { + private const val TAG = "EdudziennikData" + } + + init { + nextEndpoint(onSuccess) + } + + private fun nextEndpoint(onSuccess: () -> Unit) { + if (data.targetEndpointIds.isEmpty()) { + onSuccess() + return + } + if (data.cancelled) { + onSuccess() + return + } + val id = data.targetEndpointIds.firstKey() + val lastSync = data.targetEndpointIds.remove(id) + useEndpoint(id, lastSync) { endpointId -> + data.progress(data.progressStep) + nextEndpoint(onSuccess) + } + } + + private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) { + Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync") + when (endpointId) { + ENDPOINT_EDUDZIENNIK_WEB_START -> { + data.startProgress(R.string.edziennik_progress_endpoint_data) + EdudziennikWebStart(data, lastSync, onSuccess) + } + ENDPOINT_EDUDZIENNIK_WEB_TEACHERS -> { + data.startProgress(R.string.edziennik_progress_endpoint_teachers) + EdudziennikWebTeachers(data, lastSync, onSuccess) + } + ENDPOINT_EDUDZIENNIK_WEB_GRADES -> { + data.startProgress(R.string.edziennik_progress_endpoint_grades) + EdudziennikWebGrades(data, lastSync, onSuccess) + } + ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE -> { + data.startProgress(R.string.edziennik_progress_endpoint_timetable) + EdudziennikWebTimetable(data, lastSync, onSuccess) + } + ENDPOINT_EDUDZIENNIK_WEB_EXAMS -> { + data.startProgress(R.string.edziennik_progress_endpoint_exams) + EdudziennikWebExams(data, lastSync, onSuccess) + } + ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE -> { + data.startProgress(R.string.edziennik_progress_endpoint_attendance) + EdudziennikWebAttendance(data, lastSync, onSuccess) + } + ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS -> { + data.startProgress(R.string.edziennik_progress_endpoint_announcements) + EdudziennikWebAnnouncements(data, lastSync, onSuccess) + } + ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK -> { + data.startProgress(R.string.edziennik_progress_endpoint_homework) + EdudziennikWebHomework(data, lastSync, onSuccess) + } + ENDPOINT_EDUDZIENNIK_WEB_EVENTS -> { + data.startProgress(R.string.edziennik_progress_endpoint_events) + EdudziennikWebEvents(data, lastSync, onSuccess) + } + ENDPOINT_EDUDZIENNIK_WEB_NOTES -> { + data.startProgress(R.string.edziennik_progress_endpoint_notices) + EdudziennikWebNotes(data, lastSync, onSuccess) + } + ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER -> { + data.startProgress(R.string.edziennik_progress_endpoint_lucky_number) + EdudziennikWebLuckyNumber(data, lastSync, onSuccess) + } + else -> onSuccess(endpointId) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt new file mode 100644 index 00000000..f5adfc5d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/EdudziennikWeb.kt @@ -0,0 +1,90 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-22 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data + +import im.wangchao.mhttp.Request +import im.wangchao.mhttp.Response +import im.wangchao.mhttp.callback.TextCallbackHandler +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.utils.Utils.d +import pl.szczodrzynski.edziennik.utils.models.Date + +open class EdudziennikWeb(open val data: DataEdudziennik, open val lastSync: Long?) { + companion object { + private const val TAG = "EdudziennikWeb" + } + + val profileId + get() = data.profile?.id ?: -1 + + val profile + get() = data.profile + + fun webGet(tag: String, endpoint: String, xhr: Boolean = false, semester: Int? = null, onSuccess: (text: String) -> Unit) { + val url = "https://dziennikel.appspot.com/" + when (endpoint.endsWith('/') || endpoint.contains('?') || endpoint.isEmpty()) { + true -> endpoint + else -> "$endpoint/" + } + (semester?.let { "?semester=" + if(it == -1) "all" else it } ?: "") + + d(tag, "Request: Edudziennik/Web - $url") + + val callback = object : TextCallbackHandler() { + override fun onSuccess(text: String?, response: Response?) { + if (text == null || response == null) { + data.error(ApiError(tag, ERROR_RESPONSE_EMPTY) + .withResponse(response)) + return + } + + if (semester == null && url.contains("start")) { + profile?.also { profile -> + val cookies = data.app.cookieJar.getAll("dziennikel.appspot.com") + val semesterCookie = cookies["semester"]?.toIntOrNull() + + semesterCookie?.let { data.currentSemester = it } + + if (semesterCookie == 2 && profile.dateSemester2Start > Date.getToday()) + profile.dateSemester2Start = Date.getToday().stepForward(0, 0, -1) + } + } + + try { + onSuccess(text) + } catch (e: Exception) { + data.error(ApiError(tag, EXCEPTION_EDUDZIENNIK_WEB_REQUEST) + .withThrowable(e) + .withResponse(response) + .withApiResponse(text)) + } + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + val error = when (response?.code()) { + 402 -> ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS + 403 -> ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED + else -> ERROR_REQUEST_FAILURE + } + data.error(ApiError(tag, error) + .withResponse(response) + .withThrowable(throwable)) + } + } + + data.app.cookieJar.set("dziennikel.appspot.com", "sessionid", data.webSessionId) + + Request.builder() + .url(url) + .userAgent(EDUDZIENNIK_USER_AGENT) + .apply { + if (xhr) header("X-Requested-With", "XMLHttpRequest") + } + .get() + .callback(callback) + .build() + .enqueue() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAnnouncements.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAnnouncements.kt new file mode 100644 index 00000000..32ca353c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAnnouncements.kt @@ -0,0 +1,75 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-26 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import org.jsoup.Jsoup +import pl.szczodrzynski.edziennik.crc32 +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ANNOUNCEMENT_ID +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.db.entity.Announcement +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.utils.models.Date + +class EdudziennikWebAnnouncements(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + const val TAG = "EdudziennikWebAnnouncements" + } + + init { data.profile?.also { profile -> + webGet(TAG, data.schoolClassEndpoint + "Announcements") { text -> + val doc = Jsoup.parse(text) + + if (doc.getElementsByClass("message").text().trim() != "Brak ogłoszeń.") { + doc.select("table.list tbody tr").forEach { announcementElement -> + val titleElement = announcementElement.child(0).child(0) + + val longId = EDUDZIENNIK_ANNOUNCEMENT_ID.find(titleElement.attr("href"))?.get(1) + ?: return@forEach + val id = longId.crc32() + val subject = titleElement.text() + + val teacherName = announcementElement.child(1).text() + val teacher = data.getTeacherByFirstLast(teacherName) + + val dateString = announcementElement.getElementsByClass("datetime").first().text() + val startDate = Date.fromY_m_d(dateString) + val addedDate = Date.fromIsoHm(dateString) + + val announcementObject = Announcement( + profileId = profileId, + id = id, + subject = subject, + text = null, + startDate = startDate, + endDate = null, + teacherId = teacher.id, + addedDate = addedDate + ).also { + it.idString = longId + } + + data.announcementList.add(announcementObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_ANNOUNCEMENT, + id, + profile.empty, + profile.empty + )) + } + } + + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS, SYNC_ALWAYS) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS) + } + } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_ANNOUNCEMENTS) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt new file mode 100644 index 00000000..7fe18171 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt @@ -0,0 +1,114 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-24 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import pl.szczodrzynski.edziennik.crc32 +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_ENTRIES +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_TYPE +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ATTENDANCE_TYPES +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.singleOrNull +import pl.szczodrzynski.edziennik.utils.models.Date +import java.util.* + +class EdudziennikWebAttendance(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + private const val TAG = "EdudziennikWebAttendance" + } + + private var requestSemester: Int? = null + + init { + if (profile?.empty == true && data.currentSemester == 2) requestSemester = 1 + getAttendances() + } + + private fun getAttendances() { data.profile?.also { profile -> + webGet(TAG, data.studentEndpoint + "Presence", semester = requestSemester) { text -> + + val attendanceTypes = EDUDZIENNIK_ATTENDANCE_TYPES.find(text)?.get(1)?.split(',')?.map { + val type = EDUDZIENNIK_ATTENDANCE_TYPE.find(it.trim()) + val symbol = type?.get(1)?.trim() ?: "?" + val name = type?.get(2)?.trim() ?: "nieznany rodzaj" + return@map Triple( + symbol, + name, + when (name.toLowerCase(Locale.ROOT)) { + "obecność" -> Attendance.TYPE_PRESENT + "nieobecność" -> Attendance.TYPE_ABSENT + "spóźnienie" -> Attendance.TYPE_BELATED + "nieobecność usprawiedliwiona" -> Attendance.TYPE_ABSENT_EXCUSED + "dzień wolny" -> Attendance.TYPE_DAY_FREE + "brak zajęć" -> Attendance.TYPE_DAY_FREE + "oddelegowany" -> Attendance.TYPE_RELEASED + else -> Attendance.TYPE_UNKNOWN + } + ) + } ?: emptyList() + + EDUDZIENNIK_ATTENDANCE_ENTRIES.findAll(text).forEach { attendanceElement -> + val date = Date.fromY_m_d(attendanceElement[1]) + val lessonNumber = attendanceElement[2].toInt() + val attendanceSymbol = attendanceElement[3] + + val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date) + val lesson = lessons.firstOrNull { it.lessonNumber == lessonNumber } + + val id = "${date.stringY_m_d}:$lessonNumber:$attendanceSymbol".crc32() + + val (typeSymbol, typeName, baseType) = attendanceTypes.firstOrNull { (symbol, _, _) -> symbol == attendanceSymbol } + ?: return@forEach + + val startTime = data.lessonRanges.singleOrNull { it.lessonNumber == lessonNumber }?.startTime + ?: return@forEach + + val attendanceObject = Attendance( + profileId = profileId, + id = id, + baseType = baseType, + typeName = typeName, + typeShort = data.app.attendanceManager.getTypeShort(baseType), + typeSymbol = typeSymbol, + typeColor = null, + date = date, + startTime = lesson?.displayStartTime ?: startTime, + semester = profile.currentSemester, + teacherId = lesson?.displayTeacherId ?: -1, + subjectId = lesson?.displaySubjectId ?: -1 + ).also { + it.lessonNumber = lessonNumber + } + + data.attendanceList.add(attendanceObject) + if (baseType != Attendance.TYPE_PRESENT) { + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_ATTENDANCE, + id, + profile.empty || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == Attendance.TYPE_UNKNOWN, + profile.empty || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == Attendance.TYPE_UNKNOWN + )) + } + } + + if (profile.empty && requestSemester == 1 && data.currentSemester == 2) { + requestSemester = null + getAttendances() + } else { + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE, SYNC_ALWAYS) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE) + } + } + } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_ATTENDANCE) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebEvents.kt new file mode 100644 index 00000000..35c68478 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebEvents.kt @@ -0,0 +1,70 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-1 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import org.jsoup.Jsoup +import pl.szczodrzynski.edziennik.crc32 +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EVENT_ID +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EVENTS +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.utils.models.Date + +class EdudziennikWebEvents(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + const val TAG = "EdudziennikWebEvents" + } + + init { data.profile?.also { profile -> + webGet(TAG, data.studentAndClassesEndpoint + "KlassEvent", xhr = true) { text -> + val doc = Jsoup.parseBodyFragment("" + text.trim() + "
    ") + + doc.getElementsByTag("tr").forEach { eventElement -> + val date = Date.fromY_m_d(eventElement.child(1).text()) + + val titleElement = eventElement.child(2).child(0) + val title = titleElement.text().trim() + + val id = EDUDZIENNIK_EVENT_ID.find(titleElement.attr("href"))?.get(1)?.crc32() + ?: return@forEach + + val eventObject = Event( + profileId = profileId, + id = id, + date = date, + time = null, + topic = title, + color = null, + type = Event.TYPE_CLASS_EVENT, + teacherId = -1, + subjectId = -1, + teamId = data.teamClass?.id ?: -1 + ) + + data.eventList.add(eventObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_EVENT, + id, + profile.empty, + profile.empty + )) + } + + data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_CLASS_EVENT)) + + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_EVENTS, SYNC_ALWAYS) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_EVENTS) + } + } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_EVENTS) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt new file mode 100644 index 00000000..c700100c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebExams.kt @@ -0,0 +1,90 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-24 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import org.jsoup.Jsoup +import pl.szczodrzynski.edziennik.crc32 +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EVENT_TYPE_ID +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_EXAM_ID +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_EXAMS +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.utils.models.Date + +class EdudziennikWebExams(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + const val TAG = "EdudziennikWebExams" + } + + init { profile?.also { profile -> + webGet(TAG, data.studentAndClassEndpoint + "Evaluations", xhr = true) { text -> + val doc = Jsoup.parseBodyFragment("" + text.trim() + "
    ") + + doc.select("tr").forEach { examElement -> + val id = EDUDZIENNIK_EXAM_ID.find(examElement.child(0).child(0).attr("href")) + ?.get(1)?.crc32() ?: return@forEach + val topic = examElement.child(0).text().trim() + + val subjectElement = examElement.child(1).child(0) + val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1) + ?: return@forEach + val subjectName = subjectElement.text().trim() + val subject = data.getSubject(subjectId.crc32(), subjectName) + + val dateString = examElement.child(2).text().trim() + if (dateString.isBlank()) return@forEach + val date = Date.fromY_m_d(dateString) + + val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date) + val startTime = lessons.firstOrNull { it.displaySubjectId == subject.id }?.displayStartTime + + val eventTypeElement = examElement.child(3).child(0) + val eventTypeId = EDUDZIENNIK_EVENT_TYPE_ID.find(eventTypeElement.attr("href"))?.get(1) + ?: return@forEach + val eventTypeName = eventTypeElement.text() + val eventType = data.getEventType(eventTypeId, eventTypeName) + + val eventObject = Event( + profileId = profileId, + id = id, + date = date, + time = startTime, + topic = topic, + color = null, + type = eventType.id, + teacherId = -1, + subjectId = subject.id, + teamId = data.teamClass?.id ?: -1 + ) + + data.eventList.add(eventObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_EVENT, + id, + profile.empty, + profile.empty + )) + } + + data.toRemove.add(DataRemoveModel.Events.futureExceptTypes(listOf( + Event.TYPE_HOMEWORK, + Event.TYPE_CLASS_EVENT + ))) + + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_EXAMS, SYNC_ALWAYS) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_EXAMS) + } + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetAnnouncement.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetAnnouncement.kt new file mode 100644 index 00000000..5d915e64 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetAnnouncement.kt @@ -0,0 +1,35 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-26 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.data.api.Regexes +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.api.events.AnnouncementGetEvent +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull +import pl.szczodrzynski.edziennik.get + +class EdudziennikWebGetAnnouncement(override val data: DataEdudziennik, + private val announcement: AnnouncementFull, + val onSuccess: () -> Unit +) : EdudziennikWeb(data, null) { + companion object { + const val TAG = "EdudziennikWebGetAnnouncement" + } + + init { + webGet(TAG, "Announcement/${announcement.idString}") { text -> + val description = Regexes.EDUDZIENNIK_ANNOUNCEMENT_DESCRIPTION.find(text)?.get(1)?.trim() ?: "" + + announcement.text = description + + EventBus.getDefault().postSticky(AnnouncementGetEvent(announcement)) + + data.announcementList.add(announcement) + onSuccess() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetHomework.kt new file mode 100644 index 00000000..84171699 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGetHomework.kt @@ -0,0 +1,45 @@ +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import android.text.Html +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.data.api.Regexes +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.isNotNullNorEmpty + +class EdudziennikWebGetHomework( + override val data: DataEdudziennik, + val event: EventFull, + val onSuccess: () -> Unit +) : EdudziennikWeb(data, null) { + companion object { + const val TAG = "EdudziennikWebGetHomework" + } + + init { + if (event.attachmentNames.isNotNullNorEmpty()) { + val id = event.attachmentNames!![0] + + webGet(TAG, "Homework/$id") { text -> + val description = Regexes.EDUDZIENNIK_HOMEWORK_DESCRIPTION.find(text)?.get(1)?.trim() + + if (description != null) event.topic = Html.fromHtml(description).toString() + + event.homeworkBody = "" + event.attachmentNames = null + + data.eventList += event + data.eventListReplace = true + + EventBus.getDefault().postSticky(EventGetEvent(event)) + onSuccess() + } + } else { + EventBus.getDefault().postSticky(EventGetEvent(event)) + onSuccess() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGrades.kt new file mode 100644 index 00000000..6a247290 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebGrades.kt @@ -0,0 +1,230 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-25 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import android.graphics.Color +import org.jsoup.Jsoup +import pl.szczodrzynski.edziennik.colorFromCssName +import pl.szczodrzynski.edziennik.crc32 +import pl.szczodrzynski.edziennik.data.api.Regexes +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_GRADES +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_NORMAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_POINT_SUM +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.utils.Utils +import pl.szczodrzynski.edziennik.utils.models.Date + +class EdudziennikWebGrades(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + private const val TAG = "EdudziennikWebGrades" + } + + private var requestSemester: Int? = null + + init { + if (profile?.empty == true && data.currentSemester == 2) requestSemester = 1 + getGrades() + } + + private fun getGrades() { data.profile?.also { profile -> + webGet(TAG, data.studentEndpoint + "start", semester = requestSemester) { text -> + val semester = requestSemester ?: data.currentSemester + + val doc = Jsoup.parse(text) + val subjects = doc.select("#student_grades tbody").firstOrNull()?.children() + + subjects?.forEach { subjectElement -> + if (subjectElement.id().isBlank()) return@forEach + + val subjectId = subjectElement.id().trim() + val subjectName = subjectElement.child(0).text().trim() + val subject = data.getSubject(subjectId.crc32(), subjectName) + + val gradeType = when { + subjectElement.select("#sum").text().isNotBlank() -> TYPE_POINT_SUM + else -> TYPE_NORMAL + } + + val gradeCountToAverage = subjectElement.select("#avg").text().isNotBlank() + + val grades = subjectElement.select(".grade[data-edited]") + val gradesInfo = subjectElement.select(".grade-tip") + + val gradeValues = if (grades.isNotEmpty()) { + subjects.select(".avg-$subjectId .grade-tip > p").first() + .text().split('+').map { + val split = it.split('*') + val value = split[1].trim().toFloatOrNull() + val weight = value?.let { split[0].trim().toFloatOrNull() } ?: 0f + + Pair(value ?: 0f, weight) + } + } else emptyList() + + grades.forEachIndexed { index, gradeElement -> + val id = Regexes.EDUDZIENNIK_GRADE_ID.find(gradeElement.attr("href"))?.get(1)?.crc32() + ?: return@forEachIndexed + val (value, weight) = gradeValues[index] + val name = gradeElement.text().trim().let { + if (it.contains(',') || it.contains('.')) { + val replaced = it.replace(',', '.') + val float = replaced.toFloatOrNull() + + if (float != null && float % 1 == 0f) float.toInt().toString() + else it + } else it + } + + val info = gradesInfo[index] + val fullName = info.child(0).text().trim() + val columnName = info.child(4).text().trim() + val comment = info.ownText() + + val description = columnName + if (comment.isNotBlank()) " - $comment" else null + + val teacherName = info.child(1).text() + val teacher = data.getTeacherByLastFirst(teacherName) + + val addedDate = info.child(2).text().split(' ').let { + val day = it[0].toInt() + val month = Utils.monthFromName(it[1]) + val year = it[2].toInt() + + Date(year, month, day).inMillis + } + + val color = Regexes.STYLE_CSS_COLOR.find(gradeElement.attr("style"))?.get(1)?.let { + if (it.startsWith('#')) Color.parseColor(it) + else colorFromCssName(it) + } ?: -1 + + val gradeObject = Grade( + profileId = profileId, + id = id, + name = name, + type = gradeType, + value = value, + weight = if (gradeCountToAverage) weight else 0f, + color = color, + category = fullName, + description = description, + comment = null, + semester = semester, + teacherId = teacher.id, + subjectId = subject.id, + addedDate = addedDate + ) + + data.gradeList.add(gradeObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_GRADE, + id, + profile.empty, + profile.empty + )) + } + + val proposed = subjectElement.select(".proposal").firstOrNull()?.text()?.trim() + + if (proposed != null && proposed.isNotBlank()) { + val proposedGradeObject = Grade( + profileId = profileId, + id = (-1 * subject.id) - 1, + name = proposed, + type = when (semester) { + 1 -> TYPE_SEMESTER1_PROPOSED + else -> TYPE_SEMESTER2_PROPOSED + }, + value = proposed.toFloatOrNull() ?: 0f, + weight = 0f, + color = -1, + category = null, + description = null, + comment = null, + semester = semester, + teacherId = -1, + subjectId = subject.id + ) + + data.gradeList.add(proposedGradeObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_GRADE, + proposedGradeObject.id, + profile.empty, + profile.empty + )) + } + + val final = subjectElement.select(".final").firstOrNull()?.text()?.trim() + + if (final != null && final.isNotBlank()) { + val finalGradeObject = Grade( + profileId = profileId, + id = (-1 * subject.id) - 2, + name = final, + type = when (semester) { + 1 -> TYPE_SEMESTER1_FINAL + else -> TYPE_SEMESTER2_FINAL + }, + value = final.toFloatOrNull() ?: 0f, + weight = 0f, + color = -1, + category = null, + description = null, + comment = null, + semester = semester, + teacherId = -1, + subjectId = subject.id + ) + + data.gradeList.add(finalGradeObject) + data.metadataList.add(Metadata( + data.profileId, + Metadata.TYPE_GRADE, + finalGradeObject.id, + profile.empty, + profile.empty + )) + } + } + + if (!subjects.isNullOrEmpty()) { + data.toRemove.addAll(listOf( + TYPE_NORMAL, + TYPE_POINT_SUM, + TYPE_SEMESTER1_PROPOSED, + TYPE_SEMESTER2_PROPOSED, + TYPE_SEMESTER1_FINAL, + TYPE_SEMESTER2_FINAL + ).map { + DataRemoveModel.Grades.semesterWithType(semester, it) + }) + } + + if (profile.empty && requestSemester == 1 && data.currentSemester == 2) { + requestSemester = null + getGrades() + } else { + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_GRADES, SYNC_ALWAYS) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_GRADES) + } + } + } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_GRADES) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt new file mode 100644 index 00000000..b843abe9 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebHomework.kt @@ -0,0 +1,86 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-29 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import org.jsoup.Jsoup +import pl.szczodrzynski.edziennik.crc32 +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_HOMEWORK_ID +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.utils.models.Date + +class EdudziennikWebHomework(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + const val TAG = "EdudziennikWebHomework" + } + + init { data.profile?.also { profile -> + webGet(TAG, data.courseStudentEndpoint + "Homework", xhr = true) { text -> + val doc = Jsoup.parseBodyFragment("" + text.trim() + "
    ") + + if (doc.getElementsByClass("message").text().trim() != "Brak prac domowych") { + doc.getElementsByTag("tr").forEach { homeworkElement -> + val dateElement = homeworkElement.getElementsByClass("date").first().child(0) + val idStr = EDUDZIENNIK_HOMEWORK_ID.find(dateElement.attr("href"))?.get(1) ?: return@forEach + val id = idStr.crc32() + val date = Date.fromY_m_d(dateElement.text()) + + val subjectElement = homeworkElement.child(1).child(0) + val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1) + ?: return@forEach + val subjectName = subjectElement.text() + val subject = data.getSubject(subjectId.crc32(), subjectName) + + val lessons = data.app.db.timetableDao().getAllForDateNow(profileId, date) + val startTime = lessons.firstOrNull { it.subjectId == subject.id }?.displayStartTime + + val teacherName = homeworkElement.child(2).text() + val teacher = data.getTeacherByFirstLast(teacherName) + + val topic = homeworkElement.child(4).text()?.trim() + + val eventObject = Event( + profileId = profileId, + id = id, + date = date, + time = startTime, + topic = topic ?: "", + color = null, + type = Event.TYPE_HOMEWORK, + teacherId = teacher.id, + subjectId = subject.id, + teamId = data.teamClass?.id ?: -1 + ) + + eventObject.attachmentNames = mutableListOf(idStr) + + data.eventList.add(eventObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_HOMEWORK, + id, + profile.empty, + profile.empty + )) + } + } + + data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK)) + + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK, SYNC_ALWAYS) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK) + } + } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_HOMEWORK) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebLuckyNumber.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebLuckyNumber.kt new file mode 100644 index 00000000..db8164c8 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebLuckyNumber.kt @@ -0,0 +1,46 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-23 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.utils.models.Date + +class EdudziennikWebLuckyNumber(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + private const val TAG = "EdudziennikWebLuckyNumber" + } + + init { data.profile?.also { profile -> + webGet(TAG, data.schoolEndpoint + "Lucky", xhr = true) { text -> + text.toIntOrNull()?.also { luckyNumber -> + val luckyNumberObject = LuckyNumber( + profileId = profileId, + date = Date.getToday(), + number = luckyNumber + ) + + data.luckyNumberList.add(luckyNumberObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_LUCKY_NUMBER, + luckyNumberObject.date.value.toLong(), + true, + profile.empty + )) + } + + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER, SYNC_ALWAYS) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER) + } + } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_LUCKY_NUMBER) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebNotes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebNotes.kt new file mode 100644 index 00000000..35a78168 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebNotes.kt @@ -0,0 +1,69 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-1 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import org.jsoup.Jsoup +import pl.szczodrzynski.edziennik.crc32 +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_NOTE_ID +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_NOTES +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Notice +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.utils.models.Date + +class EdudziennikWebNotes(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + const val TAG = "EdudziennikWebNotes" + } + + init { data.profile?.also { profile -> + webGet(TAG, data.classStudentEndpoint + "RegistryNotesStudent", xhr = true) { text -> + val doc = Jsoup.parseBodyFragment("" + text.trim() + "
    ") + + doc.getElementsByTag("tr").forEach { noteElement -> + val dateElement = noteElement.getElementsByClass("date").first().child(0) + val addedDate = Date.fromY_m_d(dateElement.text()).inMillis + + val id = EDUDZIENNIK_NOTE_ID.find(dateElement.attr("href"))?.get(0)?.crc32() + ?: return@forEach + + val teacherName = noteElement.child(1).text() + val teacher = data.getTeacherByFirstLast(teacherName) + + val description = noteElement.child(3).text() + + val noticeObject = Notice( + profileId = profileId, + id = id, + type = Notice.TYPE_NEUTRAL, + semester = profile.currentSemester, + text = description, + category = null, + points = null, + teacherId = teacher.id, + addedDate = addedDate + ) + + data.noticeList.add(noticeObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_NOTICE, + id, + profile.empty, + profile.empty + )) + } + + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_NOTES, SYNC_ALWAYS) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_NOTES) + } + } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_NOTES) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt new file mode 100644 index 00000000..3fdd6e0e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebStart.kt @@ -0,0 +1,79 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-23 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import pl.szczodrzynski.edziennik.MONTH +import pl.szczodrzynski.edziennik.crc32 +import pl.szczodrzynski.edziennik.data.api.ERROR_EDUDZIENNIK_WEB_TEAM_MISSING +import pl.szczodrzynski.edziennik.data.api.Regexes +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECTS_START +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_START +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.data.db.entity.Team +import pl.szczodrzynski.edziennik.firstLettersName +import pl.szczodrzynski.edziennik.get + +class EdudziennikWebStart(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + private const val TAG = "EdudziennikWebStart" + } + + init { + webGet(TAG, data.studentEndpoint + "start") { text -> + getSchoolAndTeam(text) + getSubjects(text) + + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_START, MONTH) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_START) + } + } + + private fun getSchoolAndTeam(text: String) { + val schoolId = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_ID.find(text)?.get(1)?.trim() + val schoolLongName = Regexes.EDUDZIENNIK_SCHOOL_DETAIL_NAME.find(text)?.get(1)?.trim() + data.schoolId = schoolId + + val classId = Regexes.EDUDZIENNIK_CLASS_DETAIL_ID.find(text)?.get(1)?.trim() + val className = Regexes.EDUDZIENNIK_CLASS_DETAIL_NAME.find(text)?.get(1)?.trim() + data.classId = classId + + if (classId == null || className == null || schoolId == null || schoolLongName == null) { + data.error(ApiError(TAG, ERROR_EDUDZIENNIK_WEB_TEAM_MISSING) + .withApiResponse(text)) + return + } + + val schoolName = schoolId.crc32().toString() + schoolLongName.firstLettersName + "_edu" + data.schoolName = schoolName + + val teamId = classId.crc32() + val teamCode = "$schoolName:$className" + + val teamObject = Team( + data.profileId, + teamId, + className, + Team.TYPE_CLASS, + teamCode, + -1 + ) + + data.teamClass = teamObject + data.teamList.put(teamObject.id, teamObject) + } + + private fun getSubjects(text: String) { + EDUDZIENNIK_SUBJECTS_START.findAll(text).forEach { + val id = it[1].trim() + val name = it[2].trim() + data.getSubject(id.crc32(), name) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTeachers.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTeachers.kt new file mode 100644 index 00000000..d2f3ba15 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTeachers.kt @@ -0,0 +1,34 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-25 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import pl.szczodrzynski.edziennik.MONTH +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHERS +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TEACHERS +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.get + +class EdudziennikWebTeachers(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + private const val TAG = "EdudziennikWebTeachers" + } + + init { + webGet(TAG, data.studentAndTeacherClassEndpoint + "grid") { text -> + EDUDZIENNIK_TEACHERS.findAll(text).forEach { + val lastName = it[1].trim() + val firstName = it[2].trim() + data.getTeacher(firstName, lastName) + } + + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_TEACHERS, MONTH) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_TEACHERS) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt new file mode 100644 index 00000000..33feb75e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebTimetable.kt @@ -0,0 +1,150 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-23 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.web + +import org.jsoup.Jsoup +import pl.szczodrzynski.edziennik.crc32 +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_SUBJECT_ID +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_TEACHER_ID +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Lesson +import pl.szczodrzynski.edziennik.data.db.entity.LessonRange +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.singleOrNull +import pl.szczodrzynski.edziennik.utils.Utils.d +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time +import pl.szczodrzynski.edziennik.utils.models.Week + +class EdudziennikWebTimetable(override val data: DataEdudziennik, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : EdudziennikWeb(data, lastSync) { + companion object { + private const val TAG = "EdudziennikWebTimetable" + } + + init { data.profile?.also { profile -> + + val currentWeekStart = Week.getWeekStart() + + if (Date.getToday().weekDay > 4) { + currentWeekStart.stepForward(0, 0, 7) + } + + val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d + + val weekStart = Date.fromY_m_d(getDate) + val weekEnd = weekStart.clone().stepForward(0, 0, 6) + + webGet(TAG, data.timetableEndpoint + "print?date=$getDate") { text -> + val doc = Jsoup.parse(text) + + val dataDays = mutableListOf() + val dataStart = weekStart.clone() + while (dataStart <= weekEnd) { + dataDays += dataStart.value + dataStart.stepForward(0, 0, 1) + } + + val table = doc.select("#Schedule tbody").first() + + if (!table.text().contains("Brak planu lekcji.")) { + table.children().forEach { row -> + val rowElements = row.children() + + val lessonNumber = rowElements[0].text().toInt() + + val times = rowElements[1].text().split('-') + val startTime = Time.fromH_m(times[0].trim()) + val endTime = Time.fromH_m(times[1].trim()) + + data.lessonRanges.singleOrNull { + it.lessonNumber == lessonNumber && it.startTime == startTime && it.endTime == endTime + } ?: run { + data.lessonRanges.put(lessonNumber, LessonRange(profileId, lessonNumber, startTime, endTime)) + } + + rowElements.subList(2, rowElements.size).forEachIndexed { index, lesson -> + val course = lesson.select(".course").firstOrNull() ?: return@forEachIndexed + val info = course.select("span > span") + + if (info.isEmpty()) return@forEachIndexed + + val type = when (course.hasClass("substitute")) { + true -> Lesson.TYPE_CHANGE + else -> Lesson.TYPE_NORMAL + } + + /* Getting subject */ + + val subjectElement = info[0].child(0) + val subjectId = EDUDZIENNIK_SUBJECT_ID.find(subjectElement.attr("href"))?.get(1) + ?: return@forEachIndexed + val subjectName = subjectElement.text().trim() + val subject = data.getSubject(subjectId.crc32(), subjectName) + + /* Getting teacher */ + + val teacherId = if (info.size >= 2) { + val teacherElement = info[1].child(0) + val teacherLongId = EDUDZIENNIK_TEACHER_ID.find(teacherElement.attr("href"))?.get(1) + val teacherName = teacherElement.text().trim() + data.getTeacherByLastFirst(teacherName, teacherLongId).id + } else null + + val lessonObject = Lesson(profileId, -1).also { + it.type = type + it.date = weekStart.clone().stepForward(0, 0, index) + it.lessonNumber = lessonNumber + it.startTime = startTime + it.endTime = endTime + it.subjectId = subject.id + it.teacherId = teacherId + it.teamId = data.teamClass?.id + + it.id = it.buildId() + } + + data.lessonList.add(lessonObject) + dataDays.remove(lessonObject.date!!.value) + + if (type != Lesson.TYPE_NORMAL) { + val seen = profile.empty || lessonObject.date!! < Date.getToday() + + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_LESSON_CHANGE, + lessonObject.id, + seen, + seen + )) + } + } + } + } + + for (day in dataDays) { + val lessonDate = Date.fromValue(day) + data.lessonList += Lesson(profileId, lessonDate.value.toLong()).apply { + type = Lesson.TYPE_NO_LESSONS + date = lessonDate + } + } + + d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate") + + data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd)) + data.setSyncNext(ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE, SYNC_ALWAYS) + onSuccess(ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE) + } + } ?: onSuccess(ENDPOINT_EDUDZIENNIK_WEB_TIMETABLE) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/firstlogin/EdudziennikFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/firstlogin/EdudziennikFirstLogin.kt new file mode 100644 index 00000000..a93632b1 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/firstlogin/EdudziennikFirstLogin.kt @@ -0,0 +1,67 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-22 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.firstlogin + +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_EDUDZIENNIK +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_ACCOUNT_NAME_START +import pl.szczodrzynski.edziennik.data.api.Regexes.EDUDZIENNIK_STUDENTS_START +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.data.EdudziennikWeb +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login.EdudziennikLoginWeb +import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.fixName +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.getShortName +import pl.szczodrzynski.edziennik.set + +class EdudziennikFirstLogin(val data: DataEdudziennik, val onSuccess: () -> Unit) { + companion object { + private const val TAG = "EdudziennikFirstLogin" + } + + private val web = EdudziennikWeb(data, null) + private val profileList = mutableListOf() + + init { + val loginStoreId = data.loginStore.id + val loginStoreType = LOGIN_TYPE_EDUDZIENNIK + var firstProfileId = loginStoreId + + EdudziennikLoginWeb(data) { + web.webGet(TAG, "") { text -> + val accountNameLong = EDUDZIENNIK_ACCOUNT_NAME_START.find(text)?.get(1)?.fixName() + + EDUDZIENNIK_STUDENTS_START.findAll(text).forEach { + val studentId = it[1] + val studentNameLong = it[2].fixName() + + if (studentId.isBlank() || studentNameLong.isBlank()) return@forEach + + val studentNameShort = studentNameLong.getShortName() + val accountName = if (accountNameLong == studentNameLong) null else accountNameLong + + val profile = Profile( + firstProfileId++, + loginStoreId, + loginStoreType, + studentNameLong, + data.loginEmail, + studentNameLong, + studentNameShort, + accountName + ).apply { + studentData["studentId"] = studentId + } + profileList.add(profile) + } + + EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore)) + onSuccess() + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLogin.kt similarity index 58% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLogin.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLogin.kt index e1cef5c1..1cb2fd07 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLogin.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLogin.kt @@ -1,18 +1,17 @@ /* - * Copyright (c) Kuba Szczodrzyński 2019-10-25. + * Copyright (c) Kacper Ziubryniewicz 2019-12-22 */ -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_API -import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik +import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_EDUDZIENNIK_WEB +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik import pl.szczodrzynski.edziennik.utils.Utils -class IdziennikLogin(val data: DataIdziennik, val onSuccess: () -> Unit) { +class EdudziennikLogin(val data: DataEdudziennik, val onSuccess: () -> Unit) { companion object { - private const val TAG = "IdziennikLogin" + private const val TAG = "EdudziennikLogin" } private var cancelled = false @@ -46,13 +45,9 @@ class IdziennikLogin(val data: DataIdziennik, val onSuccess: () -> Unit) { } Utils.d(TAG, "Using login method $loginMethodId") when (loginMethodId) { - LOGIN_METHOD_IDZIENNIK_WEB -> { - data.startProgress(R.string.edziennik_progress_login_idziennik_web) - IdziennikLoginWeb(data) { onSuccess(loginMethodId) } - } - LOGIN_METHOD_IDZIENNIK_API -> { - data.startProgress(R.string.edziennik_progress_login_idziennik_api) - IdziennikLoginApi(data) { onSuccess(loginMethodId) } + LOGIN_METHOD_EDUDZIENNIK_WEB -> { + data.startProgress(R.string.edziennik_progress_login_edudziennik_web) + EdudziennikLoginWeb(data) { onSuccess(loginMethodId) } } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLoginWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLoginWeb.kt new file mode 100644 index 00000000..6b1615a2 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/login/EdudziennikLoginWeb.kt @@ -0,0 +1,97 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-22 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.login + +import im.wangchao.mhttp.Request +import im.wangchao.mhttp.Response +import im.wangchao.mhttp.callback.TextCallbackHandler +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.edudziennik.DataEdudziennik +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.getUnixDate +import pl.szczodrzynski.edziennik.isNotNullNorEmpty +import pl.szczodrzynski.edziennik.utils.Utils.d + +class EdudziennikLoginWeb(val data: DataEdudziennik, val onSuccess: () -> Unit) { + companion object { + private const val TAG = "EdudziennikLoginWeb" + } + + init { run { + if (data.isWebLoginValid()) { + onSuccess() + } + else { + data.app.cookieJar.clear("dziennikel.appspot.com") + if (data.loginEmail.isNotNullNorEmpty() && data.loginPassword.isNotNullNorEmpty()) { + loginWithCredentials() + } + else { + data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING)) + } + } + }} + + private fun loginWithCredentials() { + d(TAG, "Request: Edudziennik/Login/Web - https://dziennikel.appspot.com/login/?next=/") + + val callback = object : TextCallbackHandler() { + override fun onSuccess(text: String?, response: Response?) { + if (text == null || response == null) { + data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) + .withResponse(response)) + return + } + + val url = response.raw().request().url().toString() + + if (!url.contains("Student")) { + when { + text.contains("Wprowadzono nieprawidłową nazwę użytkownika lub hasło.") -> ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN + else -> ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER + }.let { errorCode -> + data.error(ApiError(TAG, errorCode) + .withApiResponse(text) + .withResponse(response)) + return + } + } + + val cookies = data.app.cookieJar.getAll("dziennikel.appspot.com") + val sessionId = cookies["sessionid"] + + if (sessionId == null) { + data.error(ApiError(TAG, ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID) + .withResponse(response) + .withApiResponse(text)) + return + } + + data.webSessionId = sessionId + data.webSessionIdExpiryTime = response.getUnixDate() + 45 * 60 /* 45 min */ + onSuccess() + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + data.error(ApiError(TAG, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + } + + Request.builder() + .url("https://dziennikel.appspot.com/login/?next=/") + .userAgent(EDUDZIENNIK_USER_AGENT) + .contentType("application/x-www-form-urlencoded") + .addParameter("email", data.loginEmail) + .addParameter("password", data.loginPassword) + .addParameter("auth_method", "password") + .addParameter("next", "/") + .post() + .callback(callback) + .build() + .enqueue() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/helper/DownloadAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/helper/DownloadAttachment.kt new file mode 100644 index 00000000..a968818a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/helper/DownloadAttachment.kt @@ -0,0 +1,70 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-14 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.helper + +import im.wangchao.mhttp.Request +import im.wangchao.mhttp.Response +import im.wangchao.mhttp.callback.FileCallbackHandler +import pl.szczodrzynski.edziennik.data.api.ERROR_FILE_DOWNLOAD +import pl.szczodrzynski.edziennik.data.api.ERROR_REQUEST_FAILURE +import pl.szczodrzynski.edziennik.data.api.SYSTEM_USER_AGENT +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.utils.Utils +import java.io.File + +class DownloadAttachment( + fileUrl: String, + val onSuccess: (file: File) -> Unit, + val onProgress: (written: Long, total: Long) -> Unit, + val onError: (apiError: ApiError) -> Unit +) { + companion object { + private const val TAG = "DownloadAttachment" + } + + init { + val targetFile = Utils.getStorageDir() + + val callback = object : FileCallbackHandler(targetFile) { + override fun onSuccess(file: File?, response: Response?) { + if (file == null) { + onError(ApiError(TAG, ERROR_FILE_DOWNLOAD) + .withResponse(response)) + return + } + + try { + onSuccess(file) + } catch (e: Exception) { + onError(ApiError(TAG, ERROR_FILE_DOWNLOAD) + .withResponse(response) + .withThrowable(e)) + } + } + + override fun onProgress(bytesWritten: Long, bytesTotal: Long) { + try { + this@DownloadAttachment.onProgress(bytesWritten, bytesTotal) + } catch (e: Exception) { + onError(ApiError(TAG, ERROR_FILE_DOWNLOAD) + .withThrowable(e)) + } + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + onError(ApiError(TAG, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + } + + Request.builder() + .url(fileUrl) + .userAgent(SYSTEM_USER_AGENT) + .callback(callback) + .build() + .enqueue() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/helper/OneDriveDownloadAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/helper/OneDriveDownloadAttachment.kt new file mode 100644 index 00000000..25b78527 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/helper/OneDriveDownloadAttachment.kt @@ -0,0 +1,105 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-7. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.helper + +import im.wangchao.mhttp.Request +import im.wangchao.mhttp.Response +import im.wangchao.mhttp.callback.FileCallbackHandler +import im.wangchao.mhttp.callback.TextCallbackHandler +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.api.ERROR_ONEDRIVE_DOWNLOAD +import pl.szczodrzynski.edziennik.data.api.ERROR_REQUEST_FAILURE +import pl.szczodrzynski.edziennik.data.api.SYSTEM_USER_AGENT +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.utils.Utils +import java.io.File + +class OneDriveDownloadAttachment( + app: App, + fileUrl: String, + val onSuccess: (file: File) -> Unit, + val onProgress: (written: Long, total: Long) -> Unit, + val onError: (apiError: ApiError) -> Unit +) { + companion object { + private const val TAG = "OneDriveDownloadAttachment" + } + + init { + Request.builder() + .url(fileUrl) + .userAgent(SYSTEM_USER_AGENT) + .withClient(app.httpLazy) + .callback(object : TextCallbackHandler() { + override fun onSuccess(text: String, response: Response) { + val location = response.headers().get("Location") + // https://onedrive.live.com/redir?resid=D75496A2EB87531C!706&authkey=!ABjZeh3pHMqj11Q + if (location?.contains("onedrive.live.com/redir?resid=") != true) { + onError(ApiError(TAG, ERROR_ONEDRIVE_DOWNLOAD) + .withApiResponse(text) + .withResponse(response)) + return + } + val url = location + .replace("onedrive.live.com/redir?resid=", "storage.live.com/items/") + .replace("?", "&") + .replaceFirst("&", "?") + downloadFile(url) + } + + override fun onFailure(response: Response, throwable: Throwable) { + onError(ApiError(TAG, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + }) + .build() + .enqueue() + } + + private fun downloadFile(url: String) { + val targetFile = Utils.getStorageDir() + + val callback = object : FileCallbackHandler(targetFile) { + override fun onSuccess(file: File?, response: Response?) { + if (file == null) { + onError(ApiError(TAG, ERROR_ONEDRIVE_DOWNLOAD) + .withResponse(response)) + return + } + + try { + onSuccess(file) + } catch (e: Exception) { + onError(ApiError(TAG, ERROR_ONEDRIVE_DOWNLOAD) + .withResponse(response) + .withThrowable(e)) + } + } + + override fun onProgress(bytesWritten: Long, bytesTotal: Long) { + try { + this@OneDriveDownloadAttachment.onProgress(bytesWritten, bytesTotal) + } catch (e: Exception) { + onError(ApiError(TAG, ERROR_ONEDRIVE_DOWNLOAD) + .withThrowable(e)) + } + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + onError(ApiError(TAG, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + } + + Request.builder() + .url(url) + .userAgent(SYSTEM_USER_AGENT) + .callback(callback) + .build() + .enqueue() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt deleted file mode 100644 index c3bd925a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/DataIdziennik.kt +++ /dev/null @@ -1,178 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-25. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik - -import androidx.core.util.set -import okhttp3.Cookie -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_API -import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_IDZIENNIK_WEB -import pl.szczodrzynski.edziennik.data.api.models.Data -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile -import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject -import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher - -class DataIdziennik(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) { - - fun isWebLoginValid() = loginExpiryTime-30 > currentTimeUnix() && webSessionId.isNotNullNorEmpty() && webAuth.isNotNullNorEmpty() - fun isApiLoginValid() = apiExpiryTime-30 > currentTimeUnix() && apiBearer.isNotNullNorEmpty() - - override fun satisfyLoginMethods() { - loginMethods.clear() - if (isWebLoginValid()) { - loginMethods += LOGIN_METHOD_IDZIENNIK_WEB - app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name("ASP.NET_SessionId_iDziennik") - .value(webSessionId!!) - .domain("iuczniowie.progman.pl") - .secure().httpOnly().build(), - Cookie.Builder() - .name(".ASPXAUTH") - .value(webAuth!!) - .domain("iuczniowie.progman.pl") - .secure().httpOnly().build() - )) - } - if (isApiLoginValid()) - loginMethods += LOGIN_METHOD_IDZIENNIK_API - } - - private var mLoginExpiryTime: Long? = null - var loginExpiryTime: Long - get() { mLoginExpiryTime = mLoginExpiryTime ?: loginStore.getLoginData("loginExpiryTime", 0L); return mLoginExpiryTime ?: 0L } - set(value) { loginStore.putLoginData("loginExpiryTime", value); mLoginExpiryTime = value } - - private var mApiExpiryTime: Long? = null - var apiExpiryTime: Long - get() { mApiExpiryTime = mApiExpiryTime ?: loginStore.getLoginData("apiExpiryTime", 0L); return mApiExpiryTime ?: 0L } - set(value) { loginStore.putLoginData("apiExpiryTime", value); mApiExpiryTime = value } - - /* __ __ _ - \ \ / / | | - \ \ /\ / /__| |__ - \ \/ \/ / _ \ '_ \ - \ /\ / __/ |_) | - \/ \/ \___|_._*/ - private var mWebSchoolName: String? = null - var webSchoolName: String? - get() { mWebSchoolName = mWebSchoolName ?: loginStore.getLoginData("schoolName", null); return mWebSchoolName } - set(value) { loginStore.putLoginData("schoolName", value); mWebSchoolName = value } - private var mWebUsername: String? = null - var webUsername: String? - get() { mWebUsername = mWebUsername ?: loginStore.getLoginData("username", null); return mWebUsername } - set(value) { loginStore.putLoginData("username", value); mWebUsername = value } - private var mWebPassword: String? = null - var webPassword: String? - get() { mWebPassword = mWebPassword ?: loginStore.getLoginData("password", null); return mWebPassword } - set(value) { loginStore.putLoginData("password", value); mWebPassword = value } - - private var mWebSessionId: String? = null - var webSessionId: String? - get() { mWebSessionId = mWebSessionId ?: loginStore.getLoginData("webSessionId", null); return mWebSessionId } - set(value) { loginStore.putLoginData("webSessionId", value); mWebSessionId = value } - private var mWebAuth: String? = null - var webAuth: String? - get() { mWebAuth = mWebAuth ?: loginStore.getLoginData("webAuth", null); return mWebAuth } - set(value) { loginStore.putLoginData("webAuth", value); mWebAuth = value } - - /* _ - /\ (_) - / \ _ __ _ - / /\ \ | '_ \| | - / ____ \| |_) | | - /_/ \_\ .__/|_| - | | - |*/ - private var mApiBearer: String? = null - var apiBearer: String? - get() { mApiBearer = mApiBearer ?: loginStore.getLoginData("apiBearer", null); return mApiBearer } - set(value) { loginStore.putLoginData("apiBearer", value); mApiBearer = value } - - /* ____ _ _ - / __ \| | | | - | | | | |_| |__ ___ _ __ - | | | | __| '_ \ / _ \ '__| - | |__| | |_| | | | __/ | - \____/ \__|_| |_|\___|*/ - private var mStudentId: String? = null - var studentId: String? - get() { mStudentId = mStudentId ?: profile?.getStudentData("studentId", null); return mStudentId } - set(value) { profile?.putStudentData("studentId", value) ?: return; mStudentId = value } - - private var mRegisterId: Int? = null - var registerId: Int - get() { mRegisterId = mRegisterId ?: profile?.getStudentData("registerId", 0); return mRegisterId ?: 0 } - set(value) { profile?.putStudentData("registerId", value) ?: return; mRegisterId = value } - - private var mSchoolYearId: Int? = null - var schoolYearId: Int - get() { mSchoolYearId = mSchoolYearId ?: profile?.getStudentData("schoolYearId", 0); return mSchoolYearId ?: 0 } - set(value) { profile?.putStudentData("schoolYearId", value) ?: return; mSchoolYearId = value } - - - - /* _ _ _ _ _ - | | | | | (_) | - | | | | |_ _| |___ - | | | | __| | / __| - | |__| | |_| | \__ \ - \____/ \__|_|_|__*/ - fun getSubject(name: String, id: Long?, shortName: String): Subject { - var subject = if (id == null) - subjectList.singleOrNull { it.longName == name } - else - subjectList.singleOrNull { it.id == id } - - if (subject == null) { - subject = Subject(profileId, id ?: name.crc16().toLong(), name, shortName) - subjectList[subject.id] = subject - } - return subject - } - - fun getTeacher(firstName: String, lastName: String): Teacher { - val teacher = teacherList.singleOrNull { it.fullName == "$firstName $lastName" } - return validateTeacher(teacher, firstName, lastName) - } - - fun getTeacher(firstNameChar: Char, lastName: String): Teacher { - val teacher = teacherList.singleOrNull { it.shortName == "$firstNameChar.$lastName" } - return validateTeacher(teacher, firstNameChar.toString(), lastName) - } - - fun getTeacherByLastFirst(nameLastFirst: String): Teacher { - val nameParts = nameLastFirst.split(" ") - return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[1], nameParts[0]) - } - - fun getTeacherByFirstLast(nameFirstLast: String): Teacher { - val nameParts = nameFirstLast.split(" ") - return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0], nameParts[1]) - } - - fun getTeacherByFDotLast(nameFDotLast: String): Teacher { - val nameParts = nameFDotLast.split(".") - return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0][0], nameParts[1]) - } - - fun getTeacherByFDotSpaceLast(nameFDotSpaceLast: String): Teacher { - val nameParts = nameFDotSpaceLast.split(".") - return if (nameParts.size == 1) getTeacher(nameParts[0], "") else getTeacher(nameParts[0][0], nameParts[1]) - } - - private fun validateTeacher(teacher: Teacher?, firstName: String, lastName: String): Teacher { - (teacher ?: Teacher(profileId, -1, firstName, lastName).apply { - id = shortName.crc16().toLong() - teacherList[id] = this - }).apply { - if (firstName.length > 1) - name = firstName - surname = lastName - return this - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt deleted file mode 100644 index 98010dc8..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/Idziennik.kt +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-25. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik - -import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.data.api.CODE_INTERNAL_LIBRUS_ACCOUNT_410 -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikData -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.firstlogin.IdziennikFirstLogin -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLogin -import pl.szczodrzynski.edziennik.data.api.idziennikLoginMethods -import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback -import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.api.prepare -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile -import pl.szczodrzynski.edziennik.utils.Utils.d - -class Idziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface { - companion object { - private const val TAG = "Idziennik" - } - - val internalErrorList = mutableListOf() - val data: DataIdziennik - - init { - data = DataIdziennik(app, profile, loginStore).apply { - callback = wrapCallback(this@Idziennik.callback) - satisfyLoginMethods() - } - } - - private fun completed() { - data.saveData() - data.notify { - callback.onCompleted() - } - } - - /* _______ _ _ _ _ _ - |__ __| | /\ | | (_) | | | - | | | |__ ___ / \ | | __ _ ___ _ __ _| |_| |__ _ __ ___ - | | | '_ \ / _ \ / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \ - | | | | | | __/ / ____ \| | (_| | (_) | | | | |_| | | | | | | | | - |_| |_| |_|\___| /_/ \_\_|\__, |\___/|_| |_|\__|_| |_|_| |_| |_| - __/ | - |__*/ - override fun sync(featureIds: List, viewId: Int?, arguments: JsonObject?) { - data.arguments = arguments - data.prepare(idziennikLoginMethods, IdziennikFeatures, featureIds, viewId) - d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}") - d(TAG, "Endpoint IDs: ${data.targetEndpointIds}") - IdziennikLogin(data) { - IdziennikData(data) { - completed() - } - } - } - - override fun getMessage(message: MessageFull) { - - } - - override fun markAllAnnouncementsAsRead() { - - } - - override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) { - - } - - override fun firstLogin() { - IdziennikFirstLogin(data) { - completed() - } - } - - override fun cancel() { - d(TAG, "Cancelled") - data.cancel() - } - - private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback { - return object : EdziennikCallback { - override fun onCompleted() { - callback.onCompleted() - } - - override fun onProgress(step: Float) { - callback.onProgress(step) - } - - override fun onStartProgress(stringRes: Int) { - callback.onStartProgress(stringRes) - } - - override fun onError(apiError: ApiError) { - when (apiError.errorCode) { - in internalErrorList -> { - // finish immediately if the same error occurs twice during the same sync - callback.onError(apiError) - } - CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> { - internalErrorList.add(apiError.errorCode) - loginStore.removeLoginData("refreshToken") // force a clean login - //loginLibrus() - } - else -> callback.onError(apiError) - } - } - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/IdziennikFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/IdziennikFeatures.kt deleted file mode 100644 index 02aaabb2..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/IdziennikFeatures.kt +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-25. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik - -import pl.szczodrzynski.edziennik.data.api.* -import pl.szczodrzynski.edziennik.data.api.models.Feature - -const val ENDPOINT_IDZIENNIK_WEB_TIMETABLE = 1030 -const val ENDPOINT_IDZIENNIK_WEB_GRADES = 1040 -const val ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES = 1050 -const val ENDPOINT_IDZIENNIK_WEB_EXAMS = 1060 -const val ENDPOINT_IDZIENNIK_WEB_HOMEWORK = 1061 -const val ENDPOINT_IDZIENNIK_WEB_NOTICES = 1070 -const val ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS = 1080 -const val ENDPOINT_IDZIENNIK_WEB_ATTENDANCE = 1090 -const val ENDPOINT_IDZIENNIK_WEB_MESSAGES_INBOX = 1110 -const val ENDPOINT_IDZIENNIK_WEB_MESSAGES_SENT = 1120 -const val ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER = 2010 -const val ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX = 2110 -const val ENDPOINT_IDZIENNIK_API_MESSAGES_SENT = 2120 - -val IdziennikFeatures = listOf( - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_TIMETABLE, listOf( - ENDPOINT_IDZIENNIK_WEB_TIMETABLE to LOGIN_METHOD_IDZIENNIK_WEB - ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)), - - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_GRADES, listOf( - ENDPOINT_IDZIENNIK_WEB_GRADES to LOGIN_METHOD_IDZIENNIK_WEB, - ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES to LOGIN_METHOD_IDZIENNIK_WEB - ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)), - - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_AGENDA, listOf( - ENDPOINT_IDZIENNIK_WEB_EXAMS to LOGIN_METHOD_IDZIENNIK_WEB - ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)), - - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_HOMEWORK, listOf( - ENDPOINT_IDZIENNIK_WEB_HOMEWORK to LOGIN_METHOD_IDZIENNIK_WEB - ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)), - - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_BEHAVIOUR, listOf( - ENDPOINT_IDZIENNIK_WEB_NOTICES to LOGIN_METHOD_IDZIENNIK_WEB - ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)), - - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_ATTENDANCE, listOf( - ENDPOINT_IDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_IDZIENNIK_WEB - ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)), - - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_ANNOUNCEMENTS, listOf( - ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS to LOGIN_METHOD_IDZIENNIK_WEB - ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)), - - /*Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_INBOX, listOf( - ENDPOINT_IDZIENNIK_WEB_MESSAGES_INBOX to LOGIN_METHOD_IDZIENNIK_WEB - ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)).withPriority(2), - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_SENT, listOf( - ENDPOINT_IDZIENNIK_WEB_MESSAGES_SENT to LOGIN_METHOD_IDZIENNIK_WEB - ), listOf(LOGIN_METHOD_IDZIENNIK_WEB)).withPriority(2),*/ - - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_INBOX, listOf( - ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX to LOGIN_METHOD_IDZIENNIK_API - ), listOf(LOGIN_METHOD_IDZIENNIK_API)), - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_MESSAGES_SENT, listOf( - ENDPOINT_IDZIENNIK_API_MESSAGES_SENT to LOGIN_METHOD_IDZIENNIK_API - ), listOf(LOGIN_METHOD_IDZIENNIK_API)), - - Feature(LOGIN_TYPE_IDZIENNIK, FEATURE_LUCKY_NUMBER, listOf( - ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER to LOGIN_METHOD_IDZIENNIK_API - ), listOf(LOGIN_METHOD_IDZIENNIK_API)) -) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikApi.kt deleted file mode 100644 index 05bd260d..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikApi.kt +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-29. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data - -import com.google.gson.JsonArray -import com.google.gson.JsonElement -import com.google.gson.JsonObject -import com.google.gson.JsonParser -import im.wangchao.mhttp.Request -import im.wangchao.mhttp.Response -import im.wangchao.mhttp.callback.TextCallbackHandler -import pl.szczodrzynski.edziennik.data.api.* -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.getString -import pl.szczodrzynski.edziennik.utils.Utils -import java.net.HttpURLConnection - -open class IdziennikApi(open val data: DataIdziennik) { - companion object { - const val TAG = "IdziennikApi" - } - - val profileId - get() = data.profile?.id ?: -1 - - val profile - get() = data.profile - - fun apiGet(tag: String, endpointTemplate: String, method: Int = GET, parameters: Map = emptyMap(), onSuccess: (json: JsonElement) -> Unit) { - val endpoint = endpointTemplate.replace("\$STUDENT_ID", data.studentId ?: "") - Utils.d(tag, "Request: Idziennik/API - $IDZIENNIK_API_URL/$endpoint") - - val callback = object : TextCallbackHandler() { - override fun onSuccess(text: String?, response: Response?) { - if (text == null) { - data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) - .withResponse(response)) - return - } - - val json = try { - JsonParser().parse(text) - } catch (_: Exception) { null } - - var error: String? = null - if (json == null) { - error = text - } - else if (json is JsonObject) { - error = if (response?.code() == 200) null else - json.getString("message") ?: json.toString() - } - error?.let { code -> - when (code) { - "Authorization has been denied for this request." -> ERROR_IDZIENNIK_API_ACCESS_DENIED - else -> ERROR_IDZIENNIK_API_OTHER - }.let { errorCode -> - data.error(ApiError(tag, errorCode) - .withApiResponse(text) - .withResponse(response)) - return - } - } - - try { - onSuccess(json!!) - } catch (e: Exception) { - data.error(ApiError(tag, EXCEPTION_IDZIENNIK_API_REQUEST) - .withResponse(response) - .withThrowable(e) - .withApiResponse(text)) - } - } - - override fun onFailure(response: Response?, throwable: Throwable?) { - data.error(ApiError(tag, ERROR_REQUEST_FAILURE) - .withResponse(response) - .withThrowable(throwable)) - } - } - - Request.builder() - .url("$IDZIENNIK_API_URL/$endpoint") - .userAgent(IDZIENNIK_API_USER_AGENT) - .addHeader("Authorization", "Bearer ${data.apiBearer}") - .apply { - when (method) { - GET -> get() - POST -> { - postJson() - val json = JsonObject() - parameters.map { (name, value) -> - when (value) { - is JsonObject -> json.add(name, value) - is JsonArray -> json.add(name, value) - is String -> json.addProperty(name, value) - is Int -> json.addProperty(name, value) - is Long -> json.addProperty(name, value) - is Float -> json.addProperty(name, value) - is Char -> json.addProperty(name, value) - } - } - setJsonBody(json) - } - } - } - .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED) - .allowErrorCode(HttpURLConnection.HTTP_INTERNAL_ERROR) - .callback(callback) - .build() - .enqueue() - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikData.kt deleted file mode 100644 index 7b285db9..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikData.kt +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-25. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data - -import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.* -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiCurrentRegister -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesInbox -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api.IdziennikApiMessagesSent -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web.* -import pl.szczodrzynski.edziennik.utils.Utils - -class IdziennikData(val data: DataIdziennik, val onSuccess: () -> Unit) { - companion object { - private const val TAG = "IdziennikData" - } - - init { - nextEndpoint(onSuccess) - } - - private fun nextEndpoint(onSuccess: () -> Unit) { - if (data.targetEndpointIds.isEmpty()) { - onSuccess() - return - } - if (data.cancelled) { - onSuccess() - return - } - useEndpoint(data.targetEndpointIds.removeAt(0)) { - data.progress(data.progressStep) - nextEndpoint(onSuccess) - } - } - - private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) { - Utils.d(TAG, "Using endpoint $endpointId") - when (endpointId) { - ENDPOINT_IDZIENNIK_WEB_TIMETABLE -> { - data.startProgress(R.string.edziennik_progress_endpoint_timetable) - IdziennikWebTimetable(data, onSuccess) - } - ENDPOINT_IDZIENNIK_WEB_GRADES -> { - data.startProgress(R.string.edziennik_progress_endpoint_grades) - IdziennikWebGrades(data, onSuccess) - } - ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES -> { - data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades) - IdziennikWebProposedGrades(data, onSuccess) - } - ENDPOINT_IDZIENNIK_WEB_EXAMS -> { - data.startProgress(R.string.edziennik_progress_endpoint_exams) - IdziennikWebExams(data, onSuccess) - } - ENDPOINT_IDZIENNIK_WEB_HOMEWORK -> { - data.startProgress(R.string.edziennik_progress_endpoint_homework) - IdziennikWebHomework(data, onSuccess) - } - ENDPOINT_IDZIENNIK_WEB_NOTICES -> { - data.startProgress(R.string.edziennik_progress_endpoint_notices) - IdziennikWebNotices(data, onSuccess) - } - ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS -> { - data.startProgress(R.string.edziennik_progress_endpoint_announcements) - IdziennikWebAnnouncements(data, onSuccess) - } - ENDPOINT_IDZIENNIK_WEB_ATTENDANCE -> { - data.startProgress(R.string.edziennik_progress_endpoint_attendance) - IdziennikWebAttendance(data, onSuccess) - } - ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER -> { - data.startProgress(R.string.edziennik_progress_endpoint_lucky_number) - IdziennikApiCurrentRegister(data, onSuccess) - } - ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX -> { - data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox) - IdziennikApiMessagesInbox(data, onSuccess) - } - ENDPOINT_IDZIENNIK_API_MESSAGES_SENT -> { - data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox) - IdziennikApiMessagesSent(data, onSuccess) - } - else -> onSuccess() - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt deleted file mode 100644 index c7b6820a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/IdziennikWeb.kt +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-25. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data - -import com.google.gson.JsonArray -import com.google.gson.JsonObject -import im.wangchao.mhttp.Request -import im.wangchao.mhttp.Response -import im.wangchao.mhttp.callback.JsonCallbackHandler -import im.wangchao.mhttp.callback.TextCallbackHandler -import pl.szczodrzynski.edziennik.data.api.* -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.utils.Utils.d -import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR -import java.net.HttpURLConnection.HTTP_UNAUTHORIZED - -open class IdziennikWeb(open val data: DataIdziennik) { - companion object { - const val TAG = "IdziennikWeb" - } - - val profileId - get() = data.profile?.id ?: -1 - - val profile - get() = data.profile - - fun webApiGet(tag: String, endpoint: String, parameters: Map = emptyMap(), onSuccess: (json: JsonObject) -> Unit) { - d(tag, "Request: Idziennik/Web/API - $IDZIENNIK_WEB_URL/$endpoint") - - val callback = object : JsonCallbackHandler() { - override fun onSuccess(json: JsonObject?, response: Response?) { - if (json == null && response?.parserErrorBody == null) { - data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) - .withResponse(response)) - return - } - - when { - response?.code() == HTTP_UNAUTHORIZED -> ERROR_IDZIENNIK_WEB_ACCESS_DENIED - response?.code() == HTTP_INTERNAL_ERROR -> ERROR_IDZIENNIK_WEB_SERVER_ERROR - response?.parserErrorBody != null -> when { - response.parserErrorBody.contains("Identyfikator zgłoszenia") -> ERROR_IDZIENNIK_WEB_SERVER_ERROR - response.parserErrorBody.contains("Hasło dostępu do systemu wygasło") -> ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED - response.parserErrorBody.contains("Trwają prace konserwacyjne") -> ERROR_IDZIENNIK_WEB_MAINTENANCE - else -> ERROR_IDZIENNIK_WEB_OTHER - } - else -> null - }?.let { errorCode -> - data.error(ApiError(TAG, errorCode) - .withApiResponse(json?.toString() ?: response?.parserErrorBody) - .withResponse(response)) - return - } - - if (json == null) { - data.error(ApiError(tag, ERROR_RESPONSE_EMPTY) - .withResponse(response)) - return - } - - try { - onSuccess(json) - } catch (e: Exception) { - data.error(ApiError(tag, EXCEPTION_IDZIENNIK_WEB_API_REQUEST) - .withResponse(response) - .withThrowable(e) - .withApiResponse(json)) - } - } - - override fun onFailure(response: Response?, throwable: Throwable?) { - data.error(ApiError(tag, ERROR_REQUEST_FAILURE) - .withResponse(response) - .withThrowable(throwable)) - } - } - - Request.builder() - .url("$IDZIENNIK_WEB_URL/$endpoint") - .userAgent(IDZIENNIK_USER_AGENT) - .postJson() - .apply { - val json = JsonObject() - parameters.map { (name, value) -> - when (value) { - is JsonObject -> json.add(name, value) - is JsonArray -> json.add(name, value) - is String -> json.addProperty(name, value) - is Int -> json.addProperty(name, value) - is Long -> json.addProperty(name, value) - is Float -> json.addProperty(name, value) - is Char -> json.addProperty(name, value) - is Boolean -> json.addProperty(name, value) - } - } - setJsonBody(json) - } - .allowErrorCode(HTTP_UNAUTHORIZED) - .allowErrorCode(HTTP_INTERNAL_ERROR) - .callback(callback) - .build() - .enqueue() - } - - fun webGet(tag: String, endpoint: String, onSuccess: (text: String) -> Unit) { - d(tag, "Request: Idziennik/Web - $IDZIENNIK_WEB_URL/$endpoint") - - val callback = object : TextCallbackHandler() { - override fun onSuccess(text: String?, response: Response?) { - if (text == null) { - data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) - .withResponse(response)) - return - } - - if (!text.contains("czyWyswietlicDostepMobilny")) { - when { - text.contains("Identyfikator zgłoszenia") -> ERROR_IDZIENNIK_WEB_SERVER_ERROR - text.contains("Hasło dostępu do systemu wygasło") -> ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED - text.contains("Trwają prace konserwacyjne") -> ERROR_IDZIENNIK_WEB_MAINTENANCE - else -> ERROR_IDZIENNIK_WEB_OTHER - }.let { errorCode -> - data.error(ApiError(TAG, errorCode) - .withApiResponse(text) - .withResponse(response)) - return - } - } - - try { - onSuccess(text) - } catch (e: Exception) { - data.error(ApiError(tag, EXCEPTION_IDZIENNIK_WEB_REQUEST) - .withResponse(response) - .withThrowable(e) - .withApiResponse(text)) - } - } - - override fun onFailure(response: Response?, throwable: Throwable?) { - data.error(ApiError(tag, ERROR_REQUEST_FAILURE) - .withResponse(response) - .withThrowable(throwable)) - } - } - - Request.builder() - .url("$IDZIENNIK_WEB_URL/$endpoint") - .userAgent(IDZIENNIK_USER_AGENT) - .get() - .callback(callback) - .build() - .enqueue() - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiCurrentRegister.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiCurrentRegister.kt deleted file mode 100644 index 1970c225..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiCurrentRegister.kt +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-29. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api - -import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.DAY -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_CURRENT_REGISTER -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi -import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.getInt -import pl.szczodrzynski.edziennik.getJsonObject -import pl.szczodrzynski.edziennik.getString -import pl.szczodrzynski.edziennik.utils.models.Date -import pl.szczodrzynski.edziennik.utils.models.Time - -class IdziennikApiCurrentRegister(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikApi(data) { - companion object { - private const val TAG = "IdziennikApiCurrentRegister" - } - - init { - data.profile?.luckyNumber = -1 - data.profile?.luckyNumberDate = null - - apiGet(TAG, IDZIENNIK_API_CURRENT_REGISTER) { json -> - if (json !is JsonObject) { - onSuccess() - return@apiGet - } - - var nextSync = System.currentTimeMillis() + 14*DAY*1000 - - val settings = json.getJsonObject("ustawienia")?.apply { - profile?.dateSemester1Start = getString("poczatekSemestru1")?.let { Date.fromY_m_d(it) } - profile?.dateSemester2Start = getString("koniecSemestru1")?.let { Date.fromY_m_d(it).stepForward(0, 0, 1) } - profile?.dateYearEnd = getString("koniecSemestru2")?.let { Date.fromY_m_d(it) } - } - - json.getInt("szczesliwyNumerek")?.let { luckyNumber -> - val luckyNumberDate = Date.getToday() - settings.getString("godzinaPublikacjiSzczesliwegoLosu") - ?.let { Time.fromH_m(it) } - ?.let { publishTime -> - val now = Time.getNow() - if (publishTime.value < 150000 && now.value < publishTime.value) { - nextSync = luckyNumberDate.combineWith(publishTime) - luckyNumberDate.stepForward(0, 0, -1) // the lucky number is still for yesterday - } - else if (publishTime.value >= 150000 && now.value > publishTime.value) { - luckyNumberDate.stepForward(0, 0, 1) // the lucky number is already for tomorrow - nextSync = luckyNumberDate.combineWith(publishTime) - } - else if (publishTime.value < 150000) { - nextSync = luckyNumberDate - .clone() - .stepForward(0, 0, 1) - .combineWith(publishTime) - } - else { - nextSync = luckyNumberDate.combineWith(publishTime) - } - } - - - val luckyNumberObject = LuckyNumber( - data.profileId, - Date.getToday(), - luckyNumber - ) - - data.luckyNumberList.add(luckyNumberObject) - data.metadataList.add( - Metadata( - profileId, - Metadata.TYPE_LUCKY_NUMBER, - luckyNumberObject.date.value.toLong(), - data.profile?.empty ?: false, - data.profile?.empty ?: false, - System.currentTimeMillis() - )) - } - - - data.setSyncNext(ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER, syncAt = nextSync) - onSuccess() - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt deleted file mode 100644 index 5542db6c..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesInbox.kt +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-30. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api - -import com.google.gson.JsonArray -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_INBOX -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi -import pl.szczodrzynski.edziennik.asJsonObjectList -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_DELETED -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.getBoolean -import pl.szczodrzynski.edziennik.getString -import pl.szczodrzynski.edziennik.utils.Utils.crc32 -import pl.szczodrzynski.edziennik.utils.models.Date - -class IdziennikApiMessagesInbox(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikApi(data) { - companion object { - private const val TAG = "IdziennikApiMessagesInbox" - } - - init { - apiGet(TAG, IDZIENNIK_API_MESSAGES_INBOX) { json -> - if (json !is JsonArray) { - onSuccess() - return@apiGet - } - - json.asJsonObjectList()?.forEach { jMessage -> - val subject = jMessage.getString("tytul") - if (subject?.contains("(") == true && subject.startsWith("iDziennik - ")) - return@forEach - if (subject?.startsWith("Uwaga dla ucznia (klasa:") == true) - return@forEach - - val messageIdStr = jMessage.getString("id") - val messageId = crc32((messageIdStr + "0").toByteArray()) - - var body = "[META:$messageIdStr;-1]" - body += jMessage.getString("tresc")?.replace("\n".toRegex(), "
    ") - - val readDate = if (jMessage.getBoolean("odczytana") == true) Date.fromIso(jMessage.getString("wersjaRekordu")) else 0 - val sentDate = Date.fromIso(jMessage.getString("dataWyslania")) - - val sender = jMessage.getAsJsonObject("nadawca") - val rTeacher = data.getTeacher( - sender.getString("imie") ?: "", - sender.getString("nazwisko") ?: "" - ) - rTeacher.loginId = sender.getString("id") + ":" + sender.getString("usr") - - val message = Message( - profileId, - messageId, - subject, - body, - if (jMessage.getBoolean("rekordUsuniety") == true) TYPE_DELETED else TYPE_RECEIVED, - rTeacher.id, - -1 - ) - - val messageRecipient = MessageRecipient( - profileId, - -1 /* me */, - -1, - readDate, - /*messageId*/ messageId - ) - - data.messageIgnoreList.add(message) - data.messageRecipientList.add(messageRecipient) - data.messageMetadataList.add(Metadata( - profileId, - Metadata.TYPE_MESSAGE, - message.id, - readDate > 0, - readDate > 0 || profile?.empty ?: false, - sentDate - )) - } - - data.setSyncNext(ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX, SYNC_ALWAYS) - onSuccess() - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt deleted file mode 100644 index a8850416..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/api/IdziennikApiMessagesSent.kt +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-30. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.api - -import com.google.gson.JsonArray -import pl.szczodrzynski.edziennik.DAY -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_API_MESSAGES_SENT -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_API_MESSAGES_SENT -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikApi -import pl.szczodrzynski.edziennik.asJsonObjectList -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.utils.Utils.crc32 -import pl.szczodrzynski.edziennik.utils.models.Date - -class IdziennikApiMessagesSent(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikApi(data) { - companion object { - private const val TAG = "IdziennikApiMessagesSent" - } - - init { - apiGet(TAG, IDZIENNIK_API_MESSAGES_SENT) { json -> - if (json !is JsonArray) { - onSuccess() - return@apiGet - } - - json.asJsonObjectList()?.forEach { jMessage -> - val messageIdStr = jMessage.get("id").asString - val messageId = crc32((messageIdStr + "1").toByteArray()) - - val subject = jMessage.get("tytul").asString - - var body = "[META:$messageIdStr;-1]" - body += jMessage.get("tresc").asString.replace("\n".toRegex(), "
    ") - - val sentDate = Date.fromIso(jMessage.get("dataWyslania").asString) - - val message = Message( - profileId, - messageId, - subject, - body, - TYPE_SENT, - -1, - -1 - ) - - for (recipientEl in jMessage.getAsJsonArray("odbiorcy")) { - val recipient = recipientEl.asJsonObject - var firstName = recipient.get("imie").asString - var lastName = recipient.get("nazwisko").asString - if (firstName.isEmpty() || lastName.isEmpty()) { - firstName = "usunięty" - lastName = "użytkownik" - } - val rTeacher = data.getTeacher(firstName, lastName) - rTeacher.loginId = recipient.get("id").asString + ":" + recipient.get("usr").asString - - val messageRecipient = MessageRecipient( - profileId, - rTeacher.id, - -1, - -1, - /*messageId*/ messageId - ) - data.messageRecipientIgnoreList.add(messageRecipient) - } - - data.messageIgnoreList.add(message) - data.metadataList.add(Metadata(profileId, Metadata.TYPE_MESSAGE, message.id, true, true, sentDate)) - } - - data.setSyncNext(ENDPOINT_IDZIENNIK_API_MESSAGES_SENT, DAY, DRAWER_ITEM_MESSAGES) - onSuccess() - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt deleted file mode 100644 index 20844220..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAnnouncements.kt +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-28. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web - -import com.google.gson.JsonArray -import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_ANNOUNCEMENTS -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.getJsonObject -import pl.szczodrzynski.edziennik.utils.models.Date - -class IdziennikWebAnnouncements(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikWeb(data) { - companion object { - private const val TAG = "IdziennikWebAnnouncements" - } - - init { - val param = JsonObject() - param.add("parametryFiltrow", JsonArray()) - - webApiGet(TAG, IDZIENNIK_WEB_ANNOUNCEMENTS, mapOf( - "uczenId" to (data.studentId ?: ""), - "param" to param - )) { result -> - val json = result.getJsonObject("d") ?: run { - data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA) - .withApiResponse(result)) - return@webApiGet - } - - for (jAnnouncementEl in json.getAsJsonArray("ListK")) { - val jAnnouncement = jAnnouncementEl.asJsonObject - // jAnnouncement - val announcementId = jAnnouncement.get("Id").asLong - - val rTeacher = data.getTeacherByFirstLast(jAnnouncement.get("Autor").asString) - val addedDate = java.lang.Long.parseLong(jAnnouncement.get("DataDodania").asString.replace("[^\\d]".toRegex(), "")) - val startDate = Date.fromMillis(java.lang.Long.parseLong(jAnnouncement.get("DataWydarzenia").asString.replace("[^\\d]".toRegex(), ""))) - - val announcementObject = Announcement( - profileId, - announcementId, - jAnnouncement.get("Temat").asString, - jAnnouncement.get("Tresc").asString, - startDate, - null, - rTeacher.id - ) - data.announcementList.add(announcementObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_ANNOUNCEMENT, - announcementObject.id, - profile?.empty ?: false, - profile?.empty ?: false, - addedDate - )) - } - - data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS, SYNC_ALWAYS) - onSuccess() - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt deleted file mode 100644 index 78f8e8b4..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebAttendance.kt +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-28. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web - -import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_ATTENDANCE -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_ATTENDANCE -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.crc16 -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.* -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.getJsonObject -import pl.szczodrzynski.edziennik.utils.models.Date -import pl.szczodrzynski.edziennik.utils.models.Time - -class IdziennikWebAttendance(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikWeb(data) { - companion object { - private const val TAG = "IdziennikWebAttendance" - } - - private var attendanceYear = Date.getToday().year - private var attendanceMonth = Date.getToday().month - private var attendancePrevMonthChecked = false - - init { - getAttendance() - } - - private fun getAttendance() { - webApiGet(TAG, IDZIENNIK_WEB_ATTENDANCE, mapOf( - "idPozDziennika" to data.registerId, - "mc" to attendanceMonth, - "rok" to attendanceYear, - "dataTygodnia" to "" - )) { result -> - val json = result.getJsonObject("d") ?: run { - data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA) - .withApiResponse(result)) - return@webApiGet - } - - for (jAttendanceEl in json.getAsJsonArray("Obecnosci")) { - val jAttendance = jAttendanceEl.asJsonObject - // jAttendance - val attendanceTypeIdziennik = jAttendance.get("TypObecnosci").asInt - if (attendanceTypeIdziennik == 5 || attendanceTypeIdziennik == 7) - continue - val attendanceDate = Date.fromY_m_d(jAttendance.get("Data").asString) - val attendanceTime = Time.fromH_m(jAttendance.get("OdDoGodziny").asString) - if (attendanceDate.combineWith(attendanceTime) > System.currentTimeMillis()) - continue - - val attendanceId = jAttendance.get("IdLesson").asString.crc16().toLong() - val rSubject = data.getSubject(jAttendance.get("Przedmiot").asString, jAttendance.get("IdPrzedmiot").asLong, "") - val rTeacher = data.getTeacherByFDotSpaceLast(jAttendance.get("PrzedmiotNauczyciel").asString) - - var attendanceName = "obecność" - var attendanceType = Attendance.TYPE_CUSTOM - - when (attendanceTypeIdziennik) { - 1 /* nieobecność usprawiedliwiona */ -> { - attendanceName = "nieobecność usprawiedliwiona" - attendanceType = TYPE_ABSENT_EXCUSED - } - 2 /* spóźnienie */ -> { - attendanceName = "spóźnienie" - attendanceType = TYPE_BELATED - } - 3 /* nieobecność nieusprawiedliwiona */ -> { - attendanceName = "nieobecność nieusprawiedliwiona" - attendanceType = TYPE_ABSENT - } - 4 /* zwolnienie */, 9 /* zwolniony / obecny */ -> { - attendanceType = TYPE_RELEASED - if (attendanceTypeIdziennik == 4) - attendanceName = "zwolnienie" - if (attendanceTypeIdziennik == 9) - attendanceName = "zwolnienie / obecność" - } - 0 /* obecny */, 8 /* Wycieczka */ -> { - attendanceType = TYPE_PRESENT - if (attendanceTypeIdziennik == 8) - attendanceName = "wycieczka" - } - } - - val semester = profile?.dateToSemester(attendanceDate) ?: 1 - - val attendanceObject = Attendance( - profileId, - attendanceId, - rTeacher.id, - rSubject.id, - semester, - attendanceName, - attendanceDate, - attendanceTime, - attendanceType - ) - - data.attendanceList.add(attendanceObject) - if (attendanceObject.type != TYPE_PRESENT) { - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_ATTENDANCE, - attendanceObject.id, - profile?.empty ?: false, - profile?.empty ?: false, - System.currentTimeMillis() - )) - } - } - - val attendanceDateValue = attendanceYear * 10000 + attendanceMonth * 100 - if (profile?.empty == true && attendanceDateValue > profile?.getSemesterStart(1)?.value ?: 99999999) { - attendancePrevMonthChecked = true // do not need to check prev month later - attendanceMonth-- - if (attendanceMonth < 1) { - attendanceMonth = 12 - attendanceYear-- - } - getAttendance() - } else if (!attendancePrevMonthChecked /* get also the previous month */) { - attendanceMonth-- - if (attendanceMonth < 1) { - attendanceMonth = 12 - attendanceYear-- - } - attendancePrevMonthChecked = true - getAttendance() - } else { - data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_ATTENDANCE, SYNC_ALWAYS) - onSuccess() - } - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt deleted file mode 100644 index bf32188c..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebExams.kt +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-28. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web - -import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_EXAMS -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_EXAMS -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.utils.models.Date - -class IdziennikWebExams(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikWeb(data) { - companion object { - private const val TAG = "IdziennikWebExams" - } - - private var examsYear = Date.getToday().year - private var examsMonth = Date.getToday().month - private var examsMonthsChecked = 0 - private var examsNextMonthChecked = false // TO DO temporary // no more // idk - - init { - getExams() - } - - private fun getExams() { - val param = JsonObject().apply { - addProperty("strona", 1) - addProperty("iloscNaStrone", "99") - addProperty("iloscRekordow", -1) - addProperty("kolumnaSort", "ss.Nazwa,sp.Data_sprawdzianu") - addProperty("kierunekSort", 0) - addProperty("maxIloscZaznaczonych", 0) - addProperty("panelFiltrow", 0) - } - - webApiGet(TAG, IDZIENNIK_WEB_EXAMS, mapOf( - "idP" to data.registerId, - "rok" to examsYear, - "miesiac" to examsMonth, - "param" to param - )) { result -> - val json = result.getJsonObject("d") ?: run { - data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA) - .withApiResponse(result)) - return@webApiGet - } - - json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { exam -> - val id = exam.getLong("_recordId") ?: return@forEach - val examDate = Date.fromY_m_d(exam.getString("data") ?: return@forEach) - val subjectName = exam.getString("przedmiot") ?: return@forEach - val subjectId = data.getSubject(subjectName, null, subjectName).id - val teacherName = exam.getString("wpisal") ?: return@forEach - val teacherId = data.getTeacherByLastFirst(teacherName).id - val topic = exam.getString("zakres") ?: "" - - val lessonList = data.db.timetableDao().getForDateNow(profileId, examDate) - val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime - - val eventType = when (exam.getString("rodzaj")) { - "sprawdzian/praca klasowa" -> Event.TYPE_EXAM - else -> Event.TYPE_SHORT_QUIZ - } - - val eventObject = Event( - profileId, - id, - examDate, - startTime, - topic, - -1, - eventType, - false, - teacherId, - subjectId, - data.teamClass?.id ?: -1 - ) - - data.eventList.add(eventObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_EVENT, - eventObject.id, - profile?.empty ?: false, - profile?.empty ?: false, - System.currentTimeMillis() - )) - } - - if (profile?.empty == true && examsMonthsChecked < 3 /* how many months backwards to check? */) { - examsMonthsChecked++ - examsMonth-- - if (examsMonth < 1) { - examsMonth = 12 - examsYear-- - } - getExams() - } else if (!examsNextMonthChecked /* get also one month forward */) { - val showDate = Date.getToday().stepForward(0, 1, 0) - examsYear = showDate.year - examsMonth = showDate.month - examsNextMonthChecked = true - getExams() - } else { - data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK)) - - data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_EXAMS, SYNC_ALWAYS) - onSuccess() - } - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt deleted file mode 100644 index 438d334e..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebGrades.kt +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-28. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web - -import android.graphics.Color -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_GRADES -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_GRADES -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.utils.models.Date - -class IdziennikWebGrades(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikWeb(data) { - companion object { - private const val TAG = "IdziennikWebGrades" - } - - init { - webApiGet(TAG, IDZIENNIK_WEB_GRADES, mapOf( - "idPozDziennika" to data.registerId - )) { result -> - val json = result.getJsonObject("d") ?: run { - data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA) - .withApiResponse(result)) - return@webApiGet - } - - json.getJsonArray("Przedmioty")?.asJsonObjectList()?.onEach { subjectJson -> - val subject = data.getSubject( - subjectJson.getString("Przedmiot") ?: return@onEach, - subjectJson.getLong("IdPrzedmiotu") ?: return@onEach, - subjectJson.getString("Przedmiot") ?: return@onEach - ) - subjectJson.getJsonArray("Oceny")?.asJsonObjectList()?.forEach { grade -> - val id = grade.getLong("idK") ?: return@forEach - val category = grade.getString("Kategoria") ?: "" - val name = grade.getString("Ocena") ?: "?" - val semester = grade.getInt("Semestr") ?: 1 - val teacher = data.getTeacherByLastFirst(grade.getString("Wystawil") ?: return@forEach) - - val countToAverage = grade.getBoolean("DoSredniej") ?: true - var value = grade.getFloat("WartoscDoSred") ?: 0.0f - val weight = if (countToAverage) - grade.getFloat("Waga") ?: 0.0f - else - 0.0f - - val gradeColor = grade.getString("Kolor") ?: "" - var colorInt = 0xff2196f3.toInt() - if (gradeColor.isNotEmpty()) { - colorInt = Color.parseColor("#$gradeColor") - } - - val gradeObject = Grade( - profileId, - id, - category, - colorInt, - "", - name, - value, - weight, - semester, - teacher.id, - subject.id) - - when (grade.getInt("Typ")) { - 0 -> { - val history = grade.getJsonArray("Historia")?.asJsonObjectList() - if (history?.isNotEmpty() == true) { - var sum = gradeObject.value * gradeObject.weight - var count = gradeObject.weight - for (historyItem in history) { - val countToTheAverage = historyItem.getBoolean("DoSredniej") ?: false - value = historyItem.get("WartoscDoSred").asFloat - val weight = historyItem.get("Waga").asFloat - - if (value > 0 && countToTheAverage) { - sum += value * weight - count += weight - } - - val historyObject = Grade( - profileId, - gradeObject.id * -1, - historyItem.get("Kategoria").asString, - Color.parseColor("#" + historyItem.get("Kolor").asString), - historyItem.get("Uzasadnienie").asString, - historyItem.get("Ocena").asString, - value, - if (value > 0f && countToTheAverage) weight * -1f else 0f, - historyItem.get("Semestr").asInt, - teacher.id, - subject.id) - historyObject.parentId = gradeObject.id - - val addedDate = historyItem.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis() - - data.gradeList.add(historyObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_GRADE, - historyObject.id, - true, - true, - addedDate - )) - } - // update the current grade's value with an average of all historical grades and itself - if (sum > 0 && count > 0) { - gradeObject.value = sum / count - } - gradeObject.isImprovement = true // gradeObject is the improved grade. Originals are historyObjects - } - } - 1 -> { - gradeObject.type = Grade.TYPE_SEMESTER1_FINAL - gradeObject.name = name - gradeObject.weight = 0f - } - 2 -> { - gradeObject.type = Grade.TYPE_YEAR_FINAL - gradeObject.name = name - gradeObject.weight = 0f - } - } - - val addedDate = grade.getString("Data_wystaw")?.let { Date.fromY_m_d(it).inMillis } ?: System.currentTimeMillis() - - data.gradeList.add(gradeObject) - data.metadataList.add( - Metadata( - profileId, - Metadata.TYPE_GRADE, - id, - data.profile?.empty ?: false, - data.profile?.empty ?: false, - addedDate - )) - } - } - - data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_GRADES, SYNC_ALWAYS) - onSuccess() - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt deleted file mode 100644 index 7cfc5b91..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebHomework.kt +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-11-25 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web - -import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_HOMEWORK -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_HOMEWORK -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.utils.models.Date - -class IdziennikWebHomework(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikWeb(data) { - companion object { - private const val TAG = "IdziennikWebHomework" - } - - init { - val param = JsonObject().apply { - addProperty("strona", 1) - addProperty("iloscNaStrone", 997) - addProperty("iloscRekordow", -1) - addProperty("kolumnaSort", "DataZadania") - addProperty("kierunekSort", 0) - addProperty("maxIloscZaznaczonych", 0) - addProperty("panelFiltrow", 0) - } - - webApiGet(TAG, IDZIENNIK_WEB_HOMEWORK, mapOf( - "idP" to data.registerId, - "data" to Date.getToday().stringY_m_d, - "wszystkie" to true, - "param" to param - )) { result -> - val json = result.getJsonObject("d") ?: run { - data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA) - .withApiResponse(result)) - return@webApiGet - } - - json.getJsonArray("ListK")?.asJsonObjectList()?.forEach { homework -> - val id = homework.getLong("_recordId") ?: return@forEach - val eventDate = Date.fromY_m_d(homework.getString("dataO") ?: return@forEach) - val subjectName = homework.getString("przed") ?: return@forEach - val subjectId = data.getSubject(subjectName, null, subjectName).id - val teacherName = homework.getString("usr") ?: return@forEach - val teacherId = data.getTeacherByLastFirst(teacherName).id - val lessonList = data.db.timetableDao().getForDateNow(profileId, eventDate) - val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.displayStartTime - val topic = homework.getString("tytul") ?: "" - - val seen = when (profile?.empty) { - true -> true - else -> eventDate < Date.getToday() - } - - - val eventObject = Event( - profileId, - id, - eventDate, - startTime, - topic, - -1, - Event.TYPE_HOMEWORK, - false, - teacherId, - subjectId, - data.teamClass?.id ?: -1 - ) - - data.eventList.add(eventObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_HOMEWORK, - eventObject.id, - seen, - seen, - System.currentTimeMillis() - )) - } - - data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK)) - - data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_HOMEWORK, SYNC_ALWAYS) - onSuccess() - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt deleted file mode 100644 index cfd0d5f6..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebNotices.kt +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-28. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web - -import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_NOTICES -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_NOTICES -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.crc16 -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice -import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice.* -import pl.szczodrzynski.edziennik.getJsonObject -import pl.szczodrzynski.edziennik.utils.models.Date - -class IdziennikWebNotices(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikWeb(data) { - companion object { - private const val TAG = "IdziennikWebNotices" - } - - init { - webApiGet(TAG, IDZIENNIK_WEB_NOTICES, mapOf( - "idPozDziennika" to data.registerId - )) { result -> - val json = result.getJsonObject("d") ?: run { - data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA) - .withApiResponse(result)) - return@webApiGet - } - - for (jNoticeEl in json.getAsJsonArray("SUwaga")) { - val jNotice = jNoticeEl.asJsonObject - // jNotice - val noticeId = jNotice.get("id").asString.crc16().toLong() - - val rTeacher = data.getTeacherByLastFirst(jNotice.get("Nauczyciel").asString) - val addedDate = Date.fromY_m_d(jNotice.get("Data").asString) - - var nType = TYPE_NEUTRAL - val jType = jNotice.get("Typ").asString - if (jType == "n") { - nType = TYPE_NEGATIVE - } else if (jType == "p") { - nType = TYPE_POSITIVE - } - - val noticeObject = Notice( - profileId, - noticeId, - jNotice.get("Tresc").asString, - jNotice.get("Semestr").asInt, - nType, - rTeacher.id) - data.noticeList.add(noticeObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_NOTICE, - noticeObject.id, - profile?.empty ?: false, - profile?.empty ?: false, - addedDate.inMillis - )) - } - - data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_NOTICES, SYNC_ALWAYS) - onSuccess() - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt deleted file mode 100644 index 701620de..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebProposedGrades.kt +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-28. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web - -import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_MISSING_GRADES -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.asJsonObjectList -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_SEMESTER1_PROPOSED -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.TYPE_YEAR_PROPOSED -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.getJsonArray -import pl.szczodrzynski.edziennik.getJsonObject -import pl.szczodrzynski.edziennik.getString -import pl.szczodrzynski.edziennik.utils.Utils.getWordGradeValue - -class IdziennikWebProposedGrades(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikWeb(data) { - companion object { - private const val TAG = "IdziennikWebProposedGrades" - } - - init { data.profile?.also { profile -> - webApiGet(TAG, IDZIENNIK_WEB_MISSING_GRADES, mapOf( - "idPozDziennika" to data.registerId - )) { result -> - val json = result.getJsonObject("d") ?: run { - data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA) - .withApiResponse(result)) - return@webApiGet - } - - json.getJsonArray("Przedmioty")?.asJsonObjectList()?.forEach { subject -> - val subjectName = subject.getString("Przedmiot") ?: return@forEach - val subjectObject = data.getSubject(subjectName, null, subjectName) - - val semester1Proposed = subject.getString("OcenaSem1") ?: "" - val semester1Value = getWordGradeValue(semester1Proposed) - val semester1Id = subjectObject.id * (-100) - 1 - - val semester2Proposed = subject.getString("OcenaSem2") ?: "" - val semester2Value = getWordGradeValue(semester2Proposed) - val semester2Id = subjectObject.id * (-100) - 2 - - if (semester1Proposed != "") { - val gradeObject = Grade( - profileId, - semester1Id, - "", - -1, - "", - semester1Value.toString(), - semester1Value.toFloat(), - 0f, - 1, - -1, - subjectObject.id - ).apply { - type = TYPE_SEMESTER1_PROPOSED - } - - data.gradeList.add(gradeObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_GRADE, - gradeObject.id, - profile.empty, - profile.empty, - System.currentTimeMillis() - )) - } - - if (semester2Proposed != "") { - val gradeObject = Grade( - profileId, - semester2Id, - "", - -1, - "", - semester2Value.toString(), - semester2Value.toFloat(), - 0f, - 2, - -1, - subjectObject.id - ).apply { - type = TYPE_YEAR_PROPOSED - } - - data.gradeList.add(gradeObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_GRADE, - gradeObject.id, - profile.empty, - profile.empty, - System.currentTimeMillis() - )) - } - } - - data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES, SYNC_ALWAYS) - onSuccess() - } - }} -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebTimetable.kt deleted file mode 100644 index d85e5692..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/data/web/IdziennikWebTimetable.kt +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-11-22 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.web - -import androidx.core.util.set -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_TIMETABLE -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.ENDPOINT_IDZIENNIK_WEB_TIMETABLE -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson -import pl.szczodrzynski.edziennik.utils.Utils.d -import pl.szczodrzynski.edziennik.utils.models.Date -import pl.szczodrzynski.edziennik.utils.models.Time -import pl.szczodrzynski.edziennik.utils.models.Week - -class IdziennikWebTimetable(override val data: DataIdziennik, - val onSuccess: () -> Unit) : IdziennikWeb(data) { - companion object { - private const val TAG = "IdziennikWebTimetable" - } - - init { data.profile?.also { profile -> - val currentWeekStart = Week.getWeekStart() - - if (Date.getToday().weekDay > 4) { - currentWeekStart.stepForward(0, 0, 7) - } - - val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d - - val weekStart = Date.fromY_m_d(getDate) - val weekEnd = weekStart.clone().stepForward(0, 0, 6) - - webApiGet(TAG, IDZIENNIK_WEB_TIMETABLE, mapOf( - "idPozDziennika" to data.registerId, - "pidRokSzkolny" to data.schoolYearId, - "data" to "${weekStart.stringY_m_d}T10:00:00.000Z" - )) { result -> - val json = result.getJsonObject("d") ?: run { - data.error(ApiError(TAG, ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA) - .withApiResponse(result)) - return@webApiGet - } - - json.getJsonArray("GodzinyLekcyjne")?.asJsonObjectList()?.forEach { range -> - val lessonRange = LessonRange( - profileId, - range.getInt("LiczbaP") ?: return@forEach, - range.getString("Poczatek")?.let { Time.fromH_m(it) } ?: return@forEach, - range.getString("Koniec")?.let { Time.fromH_m(it) } ?: return@forEach - ) - data.lessonRanges[lessonRange.lessonNumber] = lessonRange - } - - val dates = mutableSetOf() - val lessons = mutableListOf() - - json.getJsonArray("Przedmioty")?.asJsonObjectList()?.forEach { lesson -> - val subject = data.getSubject( - lesson.getString("Nazwa") ?: return@forEach, - lesson.getLong("Id"), - lesson.getString("Skrot") ?: "" - ) - val teacher = data.getTeacherByFDotLast(lesson.getString("Nauczyciel") - ?: return@forEach) - - val newSubjectName = lesson.getString("PrzedmiotZastepujacy") - val newSubject = when (newSubjectName.isNullOrBlank()) { - true -> null - else -> data.getSubject(newSubjectName, null, newSubjectName) - } - - val newTeacherName = lesson.getString("NauZastepujacy") - val newTeacher = when (newTeacherName.isNullOrBlank()) { - true -> null - else -> data.getTeacherByFDotLast(newTeacherName) - } - - val weekDay = lesson.getInt("DzienTygodnia")?.minus(1) ?: return@forEach - val lessonRange = data.lessonRanges[lesson.getInt("Godzina")?.plus(1) - ?: return@forEach] - val lessonDate = weekStart.clone().stepForward(0, 0, weekDay) - val classroom = lesson.getString("NazwaSali") - - val type = lesson.getInt("TypZastepstwa") ?: -1 - - val lessonObject = Lesson(profileId, -1) - - when (type) { - 1, 2, 3, 4, 5 -> { - lessonObject.apply { - this.type = Lesson.TYPE_CHANGE - - this.date = lessonDate - this.lessonNumber = lessonRange.lessonNumber - this.startTime = lessonRange.startTime - this.endTime = lessonRange.endTime - this.subjectId = newSubject?.id - this.teacherId = newTeacher?.id - this.teamId = data.teamClass?.id - this.classroom = classroom - - this.oldDate = lessonDate - this.oldLessonNumber = lessonRange.lessonNumber - this.oldStartTime = lessonRange.startTime - this.oldEndTime = lessonRange.endTime - this.oldSubjectId = subject.id - this.oldTeacherId = teacher.id - this.oldTeamId = data.teamClass?.id - this.oldClassroom = classroom - } - } - 0 -> { - lessonObject.apply { - this.type = Lesson.TYPE_CANCELLED - - this.oldDate = lessonDate - this.oldLessonNumber = lessonRange.lessonNumber - this.oldStartTime = lessonRange.startTime - this.oldEndTime = lessonRange.endTime - this.oldSubjectId = subject.id - this.oldTeacherId = teacher.id - this.oldTeamId = data.teamClass?.id - this.oldClassroom = classroom - } - } - else -> { - lessonObject.apply { - this.type = Lesson.TYPE_NORMAL - - this.date = lessonDate - this.lessonNumber = lessonRange.lessonNumber - this.startTime = lessonRange.startTime - this.endTime = lessonRange.endTime - this.subjectId = subject.id - this.teacherId = teacher.id - this.teamId = data.teamClass?.id - this.classroom = classroom - } - } - } - - lessonObject.id = lessonObject.buildId() - - dates.add(lessonDate.value) - lessons.add(lessonObject) - - val seen = profile.empty || lessonDate < Date.getToday() - - if (lessonObject.type != Lesson.TYPE_NORMAL && lessonDate >= Date.getToday()) { - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_LESSON_CHANGE, - lessonObject.id, - seen, - seen, - System.currentTimeMillis() - )) - } - } - - val date: Date = weekStart.clone() - while (date <= weekEnd) { - if (!dates.contains(date.value)) { - lessons.add(Lesson(profileId, date.value.toLong()).apply { - this.type = Lesson.TYPE_NO_LESSONS - this.date = date.clone() - }) - } - - date.stepForward(0, 0, 1) - } - - d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate") - - data.lessonNewList.addAll(lessons) - data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd)) - - data.setSyncNext(ENDPOINT_IDZIENNIK_WEB_TIMETABLE, SYNC_ALWAYS) - onSuccess() - } - }} -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/firstlogin/IdziennikFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/firstlogin/IdziennikFirstLogin.kt deleted file mode 100644 index 6ef9950f..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/firstlogin/IdziennikFirstLogin.kt +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-27. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.firstlogin - -import org.greenrobot.eventbus.EventBus -import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR -import pl.szczodrzynski.edziennik.data.api.IDZIENNIK_WEB_SETTINGS -import pl.szczodrzynski.edziennik.data.api.Regexes -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.data.IdziennikWeb -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login.IdziennikLoginWeb -import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile -import pl.szczodrzynski.edziennik.fixName -import pl.szczodrzynski.edziennik.get -import pl.szczodrzynski.edziennik.swapFirstLastName - -class IdziennikFirstLogin(val data: DataIdziennik, val onSuccess: () -> Unit) { - companion object { - private const val TAG = "IdziennikFirstLogin" - } - - private val web = IdziennikWeb(data) - private val profileList = mutableListOf() - - init { - IdziennikLoginWeb(data) { - web.webGet(TAG, IDZIENNIK_WEB_SETTINGS) { text -> - //val accounts = json.getJsonArray("accounts") - - val isParent = Regexes.IDZIENNIK_LOGIN_FIRST_IS_PARENT.find(text)?.get(1) != "0" - val accountNameLong = if (isParent) - Regexes.IDZIENNIK_LOGIN_FIRST_ACCOUNT_NAME.find(text)?.get(1)?.swapFirstLastName()?.fixName() - else - null - - var schoolYearName: String? = null - val schoolYear = Regexes.IDZIENNIK_LOGIN_FIRST_SCHOOL_YEAR.find(text)?.let { - schoolYearName = it[2] - it[1].toIntOrNull() - } ?: run { - data.error(ApiError(TAG, ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR) - .withApiResponse(text)) - return@webGet - } - - Regexes.IDZIENNIK_LOGIN_FIRST_STUDENT.findAll(text) - .toMutableList() - .reversed() - .forEach { match -> - val registerId = match[1].toIntOrNull() ?: return@forEach - val studentId = match[2] - val firstName = match[3] - val lastName = match[4] - val className = match[5] + " " + match[6] - - val profile = Profile() - profile.studentNameLong = "$firstName $lastName".fixName() - profile.studentNameShort = "$firstName ${lastName[0]}.".fixName() - profile.accountNameLong = accountNameLong - profile.studentClassName = className - profile.studentSchoolYear = schoolYearName - profile.name = profile.studentNameLong - profile.subname = data.webUsername - profile.empty = true - profile.putStudentData("studentId", studentId) - profile.putStudentData("registerId", registerId) - profile.putStudentData("schoolYearId", schoolYear) - profileList.add(profile) - } - - EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore)) - onSuccess() - } - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginApi.kt deleted file mode 100644 index 2afe481d..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginApi.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-27. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login - -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik - -class IdziennikLoginApi(val data: DataIdziennik, val onSuccess: () -> Unit) { - companion object { - private const val TAG = "IdziennikLoginApi" - } - - init { run { - if (data.isApiLoginValid()) { - onSuccess() - } - else { - onSuccess() - } - }} -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginWeb.kt deleted file mode 100644 index 9f10268e..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/idziennik/login/IdziennikLoginWeb.kt +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-26. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.login - -import im.wangchao.mhttp.Request -import im.wangchao.mhttp.Response -import im.wangchao.mhttp.callback.TextCallbackHandler -import okhttp3.Cookie -import pl.szczodrzynski.edziennik.HOUR -import pl.szczodrzynski.edziennik.MINUTE -import pl.szczodrzynski.edziennik.data.api.* -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.DataIdziennik -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.get -import pl.szczodrzynski.edziennik.getUnixDate -import pl.szczodrzynski.edziennik.utils.Utils - -class IdziennikLoginWeb(val data: DataIdziennik, val onSuccess: () -> Unit) { - companion object { - private const val TAG = "IdziennikLoginWeb" - } - - init { run { - if (data.isWebLoginValid()) { - data.app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name("ASP.NET_SessionId_iDziennik") - .value(data.webSessionId!!) - .domain("iuczniowie.progman.pl") - .secure().httpOnly().build(), - Cookie.Builder() - .name(".ASPXAUTH") - .value(data.webAuth!!) - .domain("iuczniowie.progman.pl") - .secure().httpOnly().build() - )) - onSuccess() - } - else { - data.app.cookieJar.clearForDomain("iuczniowie.progman.pl") - if (data.webSchoolName != null && data.webUsername != null && data.webPassword != null) { - loginWithCredentials() - } - else { - data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING)) - } - } - }} - - private fun loginWithCredentials() { - Utils.d(TAG, "Request: Idziennik/Login/Web - $IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN") - - val loginCallback = object : TextCallbackHandler() { - override fun onSuccess(text: String?, response: Response?) { - if (text.isNullOrEmpty()) { - data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) - .withResponse(response)) - return - } - - // login succeeded: there is a start page - if (text.contains("czyWyswietlicDostepMobilny")) { - val cookies = data.app.cookieJar.getForDomain("iuczniowie.progman.pl") - run { - data.webSessionId = cookies.singleOrNull { it.name() == "ASP.NET_SessionId_iDziennik" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION - data.webAuth = cookies.singleOrNull { it.name() == ".ASPXAUTH" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH - data.apiBearer = cookies.singleOrNull { it.name() == "Bearer" }?.value() ?: return@run ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER - data.loginExpiryTime = response.getUnixDate() + 30 * MINUTE /* after about 40 minutes the login didn't work already */ - data.apiExpiryTime = response.getUnixDate() + 12 * HOUR /* actually it expires after 24 hours but I'm not sure when does the token refresh. */ - return@run null - }?.let { errorCode -> - data.error(ApiError(TAG, errorCode) - .withApiResponse(text) - .withResponse(response)) - return - } - - onSuccess() - return - } - - val errorText = Regexes.IDZIENNIK_LOGIN_ERROR.find(text)?.get(1) - when { - errorText?.contains("nieprawidłową nazwę szkoły") == true -> ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME - errorText?.contains("nieprawidłowy login lub hasło") == true -> ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN - text.contains("Identyfikator zgłoszenia") -> ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR - text.contains("Hasło dostępu do systemu wygasło") -> ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED - text.contains("Trwają prace konserwacyjne") -> ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE - else -> ERROR_LOGIN_IDZIENNIK_WEB_OTHER - }.let { errorCode -> - data.error(ApiError(TAG, errorCode) - .withApiResponse(text) - .withResponse(response)) - return - } - } - - override fun onFailure(response: Response?, throwable: Throwable?) { - data.error(ApiError(TAG, ERROR_REQUEST_FAILURE) - .withResponse(response) - .withThrowable(throwable)) - } - } - - val getCallback = object : TextCallbackHandler() { - override fun onSuccess(text: String?, response: Response?) { - Request.builder() - .url("$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN") - .userAgent(IDZIENNIK_USER_AGENT) - .addHeader("Origin", "https://iuczniowie.progman.pl") - .addHeader("Referer", "$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN") - .apply { - Regexes.IDZIENNIK_LOGIN_HIDDEN_FIELDS.findAll(text ?: return@apply).forEach { - addParameter(it[1], it[2]) - } - } - .addParameter("ctl00\$ContentPlaceHolder\$nazwaPrzegladarki", IDZIENNIK_USER_AGENT) - .addParameter("ctl00\$ContentPlaceHolder\$NazwaSzkoly", data.webSchoolName) - .addParameter("ctl00\$ContentPlaceHolder\$UserName", data.webUsername) - .addParameter("ctl00\$ContentPlaceHolder\$Password", data.webPassword) - .addParameter("ctl00\$ContentPlaceHolder\$captcha", "") - .addParameter("ctl00\$ContentPlaceHolder\$Logowanie", "Zaloguj") - .post() - .allowErrorCode(502) - .callback(loginCallback) - .build() - .enqueue() - } - - override fun onFailure(response: Response?, throwable: Throwable?) { - data.error(ApiError(TAG, ERROR_REQUEST_FAILURE) - .withResponse(response) - .withThrowable(throwable)) - } - } - - Request.builder() - .url("$IDZIENNIK_WEB_URL/$IDZIENNIK_WEB_LOGIN") - .userAgent(IDZIENNIK_USER_AGENT) - .get() - .allowErrorCode(502) - .callback(getCallback) - .build() - .enqueue() - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/DataLibrus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/DataLibrus.kt index 9ccdf5c6..e77dd50d 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/DataLibrus.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/DataLibrus.kt @@ -4,16 +4,15 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus -import okhttp3.Cookie import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.currentTimeUnix import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_API import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_MESSAGES import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_PORTAL import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_LIBRUS_SYNERGIA import pl.szczodrzynski.edziennik.data.api.models.Data -import pl.szczodrzynski.edziennik.currentTimeUnix -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile import pl.szczodrzynski.edziennik.isNotNullNorEmpty class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) { @@ -31,26 +30,16 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app loginMethods += LOGIN_METHOD_LIBRUS_API if (isSynergiaLoginValid()) { loginMethods += LOGIN_METHOD_LIBRUS_SYNERGIA - app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name("DZIENNIKSID") - .value(synergiaSessionId!!) - .domain("synergia.librus.pl") - .secure().httpOnly().build() - )) + app.cookieJar.set("synergia.librus.pl", "DZIENNIKSID", synergiaSessionId) } if (isMessagesLoginValid()) { loginMethods += LOGIN_METHOD_LIBRUS_MESSAGES - app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name("DZIENNIKSID") - .value(messagesSessionId!!) - .domain("wiadomosci.librus.pl") - .secure().httpOnly().build() - )) + app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", messagesSessionId) } } + override fun generateUserCode() = "$schoolName:$apiLogin" + fun getColor(id: Int?): Int { return when (id) { 1 -> 0xFFF0E68C @@ -131,7 +120,7 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app private var mApiLogin: String? = null var apiLogin: String? get() { mApiLogin = mApiLogin ?: profile?.getStudentData("accountLogin", null); return mApiLogin } - set(value) { profile?.putStudentData("accountLogin", value) ?: return; mApiLogin = value } + set(value) { profile?.putStudentData("accountLogin", value); mApiLogin = value } /** * A Synergia password. * Used: for login (API Login Method) in Synergia mode. @@ -140,7 +129,7 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app private var mApiPassword: String? = null var apiPassword: String? get() { mApiPassword = mApiPassword ?: profile?.getStudentData("accountPassword", null); return mApiPassword } - set(value) { profile?.putStudentData("accountPassword", value) ?: return; mApiPassword = value } + set(value) { profile?.putStudentData("accountPassword", value); mApiPassword = value } /** * A JST login Code. @@ -149,7 +138,7 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app private var mApiCode: String? = null var apiCode: String? get() { mApiCode = mApiCode ?: loginStore.getLoginData("accountCode", null); return mApiCode } - set(value) { loginStore.putLoginData("accountCode", value) ?: return; mApiCode = value } + set(value) { profile?.putStudentData("accountCode", value); mApiCode = value } /** * A JST login PIN. * Used only during first login in JST mode. @@ -157,7 +146,7 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app private var mApiPin: String? = null var apiPin: String? get() { mApiPin = mApiPin ?: loginStore.getLoginData("accountPin", null); return mApiPin } - set(value) { loginStore.putLoginData("accountPin", value) ?: return; mApiPin = value } + set(value) { profile?.putStudentData("accountPin", value); mApiPin = value } /** * A Synergia API access token. @@ -187,6 +176,16 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app get() { mApiTokenExpiryTime = mApiTokenExpiryTime ?: profile?.getStudentData("accountTokenTime", 0L); return mApiTokenExpiryTime ?: 0L } set(value) { mApiTokenExpiryTime = value; profile?.putStudentData("accountTokenTime", value) ?: return; } + /** + * A push device ID, generated by Librus when registering + * a FCM token. I don't really know if this has any use, + * but it may be worthy to save that ID. + */ + private var mPushDeviceId: Int? = null + var pushDeviceId: Int + get() { mPushDeviceId = mPushDeviceId ?: profile?.getStudentData("pushDeviceId", 0); return mPushDeviceId ?: 0 } + set(value) { mPushDeviceId = value; profile?.putStudentData("pushDeviceId", value) ?: return; } + /* _____ _ / ____| (_) | (___ _ _ _ __ ___ _ __ __ _ _ __ _ @@ -256,6 +255,7 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app var startPointsSemester1: Int get() { mStartPointsSemester1 = mStartPointsSemester1 ?: profile?.getStudentData("startPointsSemester1", 0); return mStartPointsSemester1 ?: 0 } set(value) { profile?.putStudentData("startPointsSemester1", value) ?: return; mStartPointsSemester1 = value } + private var mStartPointsSemester2: Int? = null var startPointsSemester2: Int get() { mStartPointsSemester2 = mStartPointsSemester2 ?: profile?.getStudentData("startPointsSemester2", 0); return mStartPointsSemester2 ?: 0 } @@ -265,8 +265,20 @@ class DataLibrus(app: App, profile: Profile?, loginStore: LoginStore) : Data(app var enablePointGrades: Boolean get() { mEnablePointGrades = mEnablePointGrades ?: profile?.getStudentData("enablePointGrades", true); return mEnablePointGrades ?: true } set(value) { profile?.putStudentData("enablePointGrades", value) ?: return; mEnablePointGrades = value } + private var mEnableDescriptiveGrades: Boolean? = null var enableDescriptiveGrades: Boolean get() { mEnableDescriptiveGrades = mEnableDescriptiveGrades ?: profile?.getStudentData("enableDescriptiveGrades", true); return mEnableDescriptiveGrades ?: true } set(value) { profile?.putStudentData("enableDescriptiveGrades", value) ?: return; mEnableDescriptiveGrades = value } + + private var mTimetableNotPublic: Boolean? = null + var timetableNotPublic: Boolean + get() { mTimetableNotPublic = mTimetableNotPublic ?: profile?.getStudentData("timetableNotPublic", false); return mTimetableNotPublic ?: false } + set(value) { profile?.putStudentData("timetableNotPublic", value) ?: return; mTimetableNotPublic = value } + + /** + * Set to false when Recaptcha helper doesn't provide a working token. + * When it's set to false uses Synergia for messages. + */ + var messagesLoginSuccessful: Boolean = true } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt index 842938c6..abf3ac5f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt @@ -8,18 +8,24 @@ import com.google.gson.JsonObject import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusData +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api.LibrusApiAnnouncementMarkAsRead import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetAttachment import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetMessage -import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaMarkAllAnnouncementsAsRead +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetRecipientList +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesSendMessage +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.firstlogin.LibrusFirstLogin -import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLogin import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Message +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.data.db.full.MessageFull import pl.szczodrzynski.edziennik.utils.Utils.d class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface { @@ -29,6 +35,7 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va val internalErrorList = mutableListOf() val data: DataLibrus + private var afterLogin: (() -> Unit)? = null init { data = DataLibrus(app, profile, loginStore).apply { @@ -39,9 +46,7 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va private fun completed() { data.saveData() - data.notify { - callback.onCompleted() - } + callback.onCompleted() } /* _______ _ _ _ _ _ @@ -52,18 +57,20 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va |_| |_| |_|\___| /_/ \_\_|\__, |\___/|_| |_|\__|_| |_|_| |_| |_| __/ | |__*/ - override fun sync(featureIds: List, viewId: Int?, arguments: JsonObject?) { + override fun sync(featureIds: List, viewId: Int?, onlyEndpoints: List?, arguments: JsonObject?) { data.arguments = arguments - data.prepare(librusLoginMethods, LibrusFeatures, featureIds, viewId) + data.prepare(librusLoginMethods, LibrusFeatures, featureIds, viewId, onlyEndpoints) login() } - private fun login() { + private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) { d(TAG, "Trying to login with ${data.targetLoginMethodIds}") if (internalErrorList.isNotEmpty()) { d(TAG, " - Internal errors:") internalErrorList.forEach { d(TAG, " - code $it") } } + loginMethodId?.let { data.prepareFor(librusLoginMethods, it) } + afterLogin?.let { this.afterLogin = it } LibrusLogin(data) { data() } @@ -75,57 +82,78 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va d(TAG, " - Internal errors:") internalErrorList.forEach { d(TAG, " - code $it") } } - LibrusData(data) { + afterLogin?.invoke() ?: LibrusData(data) { completed() } } override fun getMessage(message: MessageFull) { - LibrusLoginPortal(data) { - LibrusLoginApi(data) { - LibrusLoginSynergia(data) { - LibrusLoginMessages(data) { - LibrusMessagesGetMessage(data, message) { - completed() - } - } - } + login(LOGIN_METHOD_LIBRUS_MESSAGES) { + if (data.messagesLoginSuccessful) LibrusMessagesGetMessage(data, message) { completed() } + else LibrusSynergiaGetMessage(data, message) { completed() } + } + } + + override fun sendMessage(recipients: List, subject: String, text: String) { + login(LOGIN_METHOD_LIBRUS_MESSAGES) { + LibrusMessagesSendMessage(data, recipients, subject, text) { + completed() } } } override fun markAllAnnouncementsAsRead() { - LibrusLoginPortal(data) { - LibrusLoginApi(data) { - LibrusLoginSynergia(data) { - LibrusSynergiaMarkAllAnnouncementsAsRead(data) { + login(LOGIN_METHOD_LIBRUS_SYNERGIA) { + LibrusSynergiaMarkAllAnnouncementsAsRead(data) { + completed() + } + } + } + + override fun getAnnouncement(announcement: AnnouncementFull) { + login(LOGIN_METHOD_LIBRUS_API) { + LibrusApiAnnouncementMarkAsRead(data, announcement) { + completed() + } + } + } + + override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) { + when (owner) { + is Message -> { + login(LOGIN_METHOD_LIBRUS_SYNERGIA) { + if (data.messagesLoginSuccessful) LibrusMessagesGetAttachment(data, owner, attachmentId, attachmentName) { completed() } + LibrusSynergiaGetAttachment(data, owner, attachmentId, attachmentName) { completed() } + } + } + is EventFull -> { + login(LOGIN_METHOD_LIBRUS_SYNERGIA) { + LibrusSynergiaHomeworkGetAttachment(data, owner, attachmentId, attachmentName) { completed() } } } + else -> completed() } } - override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) { - LibrusLoginPortal(data) { - LibrusLoginApi(data) { - LibrusLoginSynergia(data) { - LibrusLoginMessages(data) { - LibrusMessagesGetAttachment(data, message, attachmentId, attachmentName) { - completed() - } - } - } + override fun getRecipientList() { + login(LOGIN_METHOD_LIBRUS_MESSAGES) { + LibrusMessagesGetRecipientList(data) { + completed() } } } - override fun firstLogin() { - LibrusFirstLogin(data) { - completed() + override fun getEvent(eventFull: EventFull) { + login(LOGIN_METHOD_LIBRUS_SYNERGIA) { + LibrusSynergiaGetHomework(data, eventFull) { + completed() + } } } + override fun firstLogin() { LibrusFirstLogin(data) { completed() } } override fun cancel() { d(TAG, "Cancelled") data.cancel() @@ -133,18 +161,9 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback { return object : EdziennikCallback { - override fun onCompleted() { - callback.onCompleted() - } - - override fun onProgress(step: Float) { - callback.onProgress(step) - } - - override fun onStartProgress(stringRes: Int) { - callback.onStartProgress(stringRes) - } - + override fun onCompleted() { callback.onCompleted() } + override fun onProgress(step: Float) { callback.onProgress(step) } + override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) } override fun onError(apiError: ApiError) { if (apiError.errorCode in internalErrorList) { // finish immediately if the same error occurs twice during the same sync @@ -155,35 +174,32 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va when (apiError.errorCode) { ERROR_LIBRUS_PORTAL_ACCESS_DENIED -> { data.loginMethods.remove(LOGIN_METHOD_LIBRUS_PORTAL) - data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_PORTAL) - data.targetLoginMethodIds.sort() + data.prepareFor(librusLoginMethods, LOGIN_METHOD_LIBRUS_PORTAL) data.portalTokenExpiryTime = 0 login() } ERROR_LIBRUS_API_ACCESS_DENIED, ERROR_LIBRUS_API_TOKEN_EXPIRED -> { data.loginMethods.remove(LOGIN_METHOD_LIBRUS_API) - data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_API) - data.targetLoginMethodIds.sort() + data.prepareFor(librusLoginMethods, LOGIN_METHOD_LIBRUS_API) data.apiTokenExpiryTime = 0 login() } ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED -> { data.loginMethods.remove(LOGIN_METHOD_LIBRUS_SYNERGIA) - data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_SYNERGIA) - data.targetLoginMethodIds.sort() + data.prepareFor(librusLoginMethods, LOGIN_METHOD_LIBRUS_SYNERGIA) data.synergiaSessionIdExpiryTime = 0 login() } ERROR_LIBRUS_MESSAGES_ACCESS_DENIED -> { data.loginMethods.remove(LOGIN_METHOD_LIBRUS_MESSAGES) - data.targetLoginMethodIds.add(LOGIN_METHOD_LIBRUS_MESSAGES) - data.targetLoginMethodIds.sort() + data.prepareFor(librusLoginMethods, LOGIN_METHOD_LIBRUS_MESSAGES) data.messagesSessionIdExpiryTime = 0 login() } ERROR_LOGIN_LIBRUS_PORTAL_NO_CODE, ERROR_LOGIN_LIBRUS_PORTAL_CSRF_MISSING, + ERROR_LOGIN_LIBRUS_PORTAL_CSRF_EXPIRED, ERROR_LOGIN_LIBRUS_PORTAL_CODE_REVOKED, ERROR_LOGIN_LIBRUS_PORTAL_CODE_EXPIRED -> { login() @@ -202,15 +218,19 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va ERROR_LOGIN_LIBRUS_MESSAGES_NO_SESSION_ID -> { login() } - // TODO PORTAL CAPTCHA ERROR_LIBRUS_API_TIMETABLE_NOT_PUBLIC -> { - loginStore.putLoginData("timetableNotPublic", true) + data.timetableNotPublic = true data() } ERROR_LIBRUS_API_LUCKY_NUMBER_NOT_ACTIVE, ERROR_LIBRUS_API_NOTES_NOT_ACTIVE -> { data() } + ERROR_LIBRUS_API_DEVICE_REGISTERED -> { + data.app.config.sync.tokenLibrusList = + data.app.config.sync.tokenLibrusList + data.profileId + data() + } else -> callback.onError(apiError) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusFeatures.kt index 132d6af1..c14a00df 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusFeatures.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusFeatures.kt @@ -15,6 +15,7 @@ const val ENDPOINT_LIBRUS_API_UNITS = 1005 const val ENDPOINT_LIBRUS_API_USERS = 1006 const val ENDPOINT_LIBRUS_API_SUBJECTS = 1007 const val ENDPOINT_LIBRUS_API_CLASSROOMS = 1008 +const val ENDPOINT_LIBRUS_API_LESSONS = 1009 const val ENDPOINT_LIBRUS_API_PUSH_CONFIG = 1010 const val ENDPOINT_LIBRUS_API_TIMETABLES = 1015 const val ENDPOINT_LIBRUS_API_SUBSTITUTIONS = 1016 @@ -49,19 +50,23 @@ const val ENDPOINT_LIBRUS_API_CLASS_FREE_DAYS = 1130 const val ENDPOINT_LIBRUS_SYNERGIA_INFO = 2010 const val ENDPOINT_LIBRUS_SYNERGIA_GRADES = 2020 const val ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK = 2030 +const val ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_RECEIVED = 2040 +const val ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_SENT = 2050 const val ENDPOINT_LIBRUS_MESSAGES_RECEIVED = 3010 const val ENDPOINT_LIBRUS_MESSAGES_SENT = 3020 const val ENDPOINT_LIBRUS_MESSAGES_TRASH = 3030 -const val ENDPOINT_LIBRUS_MESSAGES_RECEIVERS = 3040 -const val ENDPOINT_LIBRUS_MESSAGES_GET = 3040 val LibrusFeatures = listOf( + Feature(LOGIN_TYPE_LIBRUS, FEATURE_ALWAYS_NEEDED, listOf( + ENDPOINT_LIBRUS_API_LESSONS to LOGIN_METHOD_LIBRUS_API + ), listOf(LOGIN_METHOD_LIBRUS_API)), + // push config Feature(LOGIN_TYPE_LIBRUS, FEATURE_PUSH_CONFIG, listOf( ENDPOINT_LIBRUS_API_PUSH_CONFIG to LOGIN_METHOD_LIBRUS_API ), listOf(LOGIN_METHOD_LIBRUS_API)).withShouldSync { data -> - !data.app.config.sync.tokenLibrusList.contains(data.profileId) + (data as DataLibrus).isPremium && !data.app.config.sync.tokenLibrusList.contains(data.profileId) }, @@ -96,7 +101,8 @@ val LibrusFeatures = listOf( ENDPOINT_LIBRUS_API_NORMAL_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API, ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API, ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API, - ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API, + // Commented out, because TextGrades/Categories is the same as Grades/Categories + /* ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API, */ ENDPOINT_LIBRUS_API_DESCRIPTIVE_TEXT_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API, ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES to LOGIN_METHOD_LIBRUS_API, ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS to LOGIN_METHOD_LIBRUS_API, @@ -112,11 +118,11 @@ val LibrusFeatures = listOf( * Homework - using API. * Sync only if account has premium access. */ - Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf( + /*Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf( ENDPOINT_LIBRUS_API_HOMEWORK to LOGIN_METHOD_LIBRUS_API ), listOf(LOGIN_METHOD_LIBRUS_API)).withShouldSync { data -> (data as DataLibrus).isPremium - }, + },*/ /** * Behaviour - using API. */ @@ -223,9 +229,9 @@ val LibrusFeatures = listOf( */ Feature(LOGIN_TYPE_LIBRUS, FEATURE_HOMEWORK, listOf( ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK to LOGIN_METHOD_LIBRUS_SYNERGIA - ), listOf(LOGIN_METHOD_LIBRUS_SYNERGIA)).withShouldSync { data -> + ), listOf(LOGIN_METHOD_LIBRUS_SYNERGIA))/*.withShouldSync { data -> !(data as DataLibrus).isPremium - }, + }*/, /** * Messages inbox - using messages website. diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusRecaptchaHelper.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusRecaptchaHelper.kt new file mode 100644 index 00000000..3652f18a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/LibrusRecaptchaHelper.kt @@ -0,0 +1,60 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-8. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus + +import android.content.Context +import android.webkit.WebView +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch +import pl.szczodrzynski.edziennik.startCoroutineTimer +import kotlin.coroutines.CoroutineContext + +class LibrusRecaptchaHelper( + val context: Context, + url: String, + html: String, + val onSuccess: (url: String) -> Unit, + val onTimeout: () -> Unit +) : CoroutineScope { + companion object { + private const val TAG = "LibrusRecaptchaHelper" + } + + private val job: Job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Default + + private val webView by lazy { + WebView(context).also { + it.settings.javaScriptEnabled = true + it.webViewClient = WebViewClient() + } + } + + private var timeout: Job? = null + private var timedOut = false + + inner class WebViewClient : android.webkit.WebViewClient() { + override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean { + timeout?.cancel() + if (!timedOut) { + onSuccess(url) + } + return true + } + } + + init { + launch(Dispatchers.Main) { + webView.loadDataWithBaseURL(url, html, "text/html", "UTF-8", null) + } + timeout = startCoroutineTimer(delayMillis = 10000L) { + timedOut = true + onTimeout() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusApi.kt index 317a79aa..d06cc219 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusApi.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusApi.kt @@ -15,7 +15,7 @@ import pl.szczodrzynski.edziennik.getString import pl.szczodrzynski.edziennik.utils.Utils.d import java.net.HttpURLConnection.* -open class LibrusApi(open val data: DataLibrus) { +open class LibrusApi(open val data: DataLibrus, open val lastSync: Long?) { companion object { private const val TAG = "LibrusApi" } @@ -26,7 +26,7 @@ open class LibrusApi(open val data: DataLibrus) { val profile get() = data.profile - fun apiGet(tag: String, endpoint: String, method: Int = GET, payload: JsonObject? = null, onSuccess: (json: JsonObject) -> Unit) { + fun apiGet(tag: String, endpoint: String, method: Int = GET, payload: JsonObject? = null, ignoreErrors: List = emptyList(), onSuccess: (json: JsonObject) -> Unit) { d(tag, "Request: Librus/Api - ${if (data.fakeLogin) FAKE_LIBRUS_API else LIBRUS_API_URL}/$endpoint") @@ -44,9 +44,12 @@ open class LibrusApi(open val data: DataLibrus) { .withResponse(response)) return } + /* +{"Status":"Error","Code":"DeviceRegistered","Message":"This device is alerdy registered.","Resources":{"..":{"Url":"https:\/\/api.librus.pl\/2.0\/Root"}},"Url":"https:\/\/api.librus.pl\/2.0\/ChangeRegister"}*/ val error = if (response?.code() == 200) null else json.getString("Code") ?: json.getString("Message") ?: + json.getString("Status") ?: response?.parserErrorBody error?.let { code -> when (code) { @@ -63,12 +66,17 @@ open class LibrusApi(open val data: DataLibrus) { "NotesIsNotActive" -> ERROR_LIBRUS_API_NOTES_NOT_ACTIVE "InvalidRequest" -> ERROR_LIBRUS_API_INVALID_REQUEST_PARAMS "Nieprawidłowy węzeł." -> ERROR_LIBRUS_API_INCORRECT_ENDPOINT + "NoticeboardProblem" -> ERROR_LIBRUS_API_NOTICEBOARD_PROBLEM + "DeviceRegistered" -> ERROR_LIBRUS_API_DEVICE_REGISTERED + "Maintenance" -> ERROR_LIBRUS_API_MAINTENANCE else -> ERROR_LIBRUS_API_OTHER }.let { errorCode -> - data.error(ApiError(tag, errorCode) - .withApiResponse(json) - .withResponse(response)) - return + if (errorCode !in ignoreErrors) { + data.error(ApiError(tag, errorCode) + .withApiResponse(json) + .withResponse(response)) + return + } } } @@ -112,6 +120,8 @@ open class LibrusApi(open val data: DataLibrus) { .allowErrorCode(HTTP_FORBIDDEN) .allowErrorCode(HTTP_UNAUTHORIZED) .allowErrorCode(HTTP_UNAVAILABLE) + .allowErrorCode(HTTP_NOT_FOUND) + .allowErrorCode(503) .callback(callback) .build() .enqueue() diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusData.kt index bccb86b3..877d803b 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusData.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusData.kt @@ -8,9 +8,10 @@ import pl.szczodrzynski.edziennik.R import pl.szczodrzynski.edziennik.data.api.edziennik.librus.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusMessagesGetList +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaGetMessages import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaHomework import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia.LibrusSynergiaInfo -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message +import pl.szczodrzynski.edziennik.data.db.entity.Message import pl.szczodrzynski.edziennik.utils.Utils class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) { @@ -31,129 +32,163 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) { onSuccess() return } - useEndpoint(data.targetEndpointIds.removeAt(0)) { + val id = data.targetEndpointIds.firstKey() + val lastSync = data.targetEndpointIds.remove(id) + useEndpoint(id, lastSync) { endpointId -> data.progress(data.progressStep) nextEndpoint(onSuccess) } } - private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) { - Utils.d(TAG, "Using endpoint $endpointId") + private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) { + Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync") when (endpointId) { /** * API */ ENDPOINT_LIBRUS_API_ME -> { data.startProgress(R.string.edziennik_progress_endpoint_student_info) - LibrusApiMe(data, onSuccess) + LibrusApiMe(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_SCHOOLS -> { data.startProgress(R.string.edziennik_progress_endpoint_school_info) - LibrusApiSchools(data, onSuccess) + LibrusApiSchools(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_CLASSES -> { data.startProgress(R.string.edziennik_progress_endpoint_classes) - LibrusApiClasses(data, onSuccess) + LibrusApiClasses(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES -> { data.startProgress(R.string.edziennik_progress_endpoint_teams) - LibrusApiVirtualClasses(data, onSuccess) + LibrusApiVirtualClasses(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_UNITS -> { data.startProgress(R.string.edziennik_progress_endpoint_units) - LibrusApiUnits(data, onSuccess) + LibrusApiUnits(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_USERS -> { data.startProgress(R.string.edziennik_progress_endpoint_teachers) - LibrusApiUsers(data, onSuccess) + LibrusApiUsers(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_SUBJECTS -> { data.startProgress(R.string.edziennik_progress_endpoint_subjects) - LibrusApiSubjects(data, onSuccess) + LibrusApiSubjects(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_CLASSROOMS -> { data.startProgress(R.string.edziennik_progress_endpoint_classrooms) - LibrusApiClassrooms(data, onSuccess) + LibrusApiClassrooms(data, lastSync, onSuccess) + } + ENDPOINT_LIBRUS_API_LESSONS -> { + data.startProgress(R.string.edziennik_progress_endpoint_lessons) + LibrusApiLessons(data, lastSync, onSuccess) + } + ENDPOINT_LIBRUS_API_PUSH_CONFIG -> { + data.startProgress(R.string.edziennik_progress_endpoint_push_config) + LibrusApiPushConfig(data, lastSync, onSuccess) } - // TODO push config ENDPOINT_LIBRUS_API_TIMETABLES -> { data.startProgress(R.string.edziennik_progress_endpoint_timetable) - LibrusApiTimetables(data, onSuccess) + LibrusApiTimetables(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_NORMAL_GRADE_CATEGORIES -> { data.startProgress(R.string.edziennik_progress_endpoint_grade_categories) - LibrusApiGradeCategories(data, onSuccess) + LibrusApiGradeCategories(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES -> { data.startProgress(R.string.edziennik_progress_endpoint_grade_categories) - LibrusApiBehaviourGradeCategories(data, onSuccess) + LibrusApiBehaviourGradeCategories(data, lastSync, onSuccess) } + ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES -> { + data.startProgress(R.string.edziennik_progress_endpoint_grade_categories) + LibrusApiDescriptiveGradeCategories(data, lastSync, onSuccess) + } + ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES -> { + data.startProgress(R.string.edziennik_progress_endpoint_grade_categories) + LibrusApiTextGradeCategories(data, lastSync, onSuccess) + } + ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES -> { + data.startProgress(R.string.edziennik_progress_endpoint_grade_categories) + LibrusApiPointGradeCategories(data, lastSync, onSuccess) + } + ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS -> { data.startProgress(R.string.edziennik_progress_endpoint_grade_comments) - LibrusApiGradeComments(data, onSuccess) + LibrusApiGradeComments(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_COMMENTS -> { data.startProgress(R.string.edziennik_progress_endpoint_grade_comments) - LibrusApiBehaviourGradeComments(data, onSuccess) + LibrusApiBehaviourGradeComments(data, lastSync, onSuccess) } + ENDPOINT_LIBRUS_API_NORMAL_GRADES -> { data.startProgress(R.string.edziennik_progress_endpoint_grades) - LibrusApiGrades(data, onSuccess) + LibrusApiGrades(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES -> { data.startProgress(R.string.edziennik_progress_endpoint_behaviour_grades) - LibrusApiBehaviourGrades(data, onSuccess) + LibrusApiBehaviourGrades(data, lastSync, onSuccess) + } + ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES -> { + data.startProgress(R.string.edziennik_progress_endpoint_descriptive_grades) + LibrusApiDescriptiveGrades(data, lastSync, onSuccess) + } + ENDPOINT_LIBRUS_API_TEXT_GRADES -> { + data.startProgress(R.string.edziennik_progress_endpoint_descriptive_grades) + LibrusApiTextGrades(data, lastSync, onSuccess) + } + ENDPOINT_LIBRUS_API_POINT_GRADES -> { + data.startProgress(R.string.edziennik_progress_endpoint_point_grades) + LibrusApiPointGrades(data, lastSync, onSuccess) } - // TODO grades ENDPOINT_LIBRUS_API_EVENT_TYPES -> { data.startProgress(R.string.edziennik_progress_endpoint_event_types) - LibrusApiEventTypes(data, onSuccess) + LibrusApiEventTypes(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_EVENTS -> { data.startProgress(R.string.edziennik_progress_endpoint_events) - LibrusApiEvents(data, onSuccess) + LibrusApiEvents(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_HOMEWORK -> { data.startProgress(R.string.edziennik_progress_endpoint_homework) - LibrusApiHomework(data, onSuccess) + LibrusApiHomework(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_LUCKY_NUMBER -> { data.startProgress(R.string.edziennik_progress_endpoint_lucky_number) - LibrusApiLuckyNumber(data, onSuccess) + LibrusApiLuckyNumber(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_NOTICE_TYPES -> { data.startProgress(R.string.edziennik_progress_endpoint_notice_types) - LibrusApiNoticeTypes(data, onSuccess) + LibrusApiNoticeTypes(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_NOTICES -> { data.startProgress(R.string.edziennik_progress_endpoint_notices) - LibrusApiNotices(data, onSuccess) + LibrusApiNotices(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES -> { data.startProgress(R.string.edziennik_progress_endpoint_attendance_types) - LibrusApiAttendanceTypes(data, onSuccess) + LibrusApiAttendanceTypes(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_ATTENDANCES -> { data.startProgress(R.string.edziennik_progress_endpoint_attendance) - LibrusApiAttendances(data, onSuccess) + LibrusApiAttendances(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_ANNOUNCEMENTS -> { data.startProgress(R.string.edziennik_progress_endpoint_announcements) - LibrusApiAnnouncements(data, onSuccess) + LibrusApiAnnouncements(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_PT_MEETINGS -> { data.startProgress(R.string.edziennik_progress_endpoint_pt_meetings) - LibrusApiPtMeetings(data, onSuccess) + LibrusApiPtMeetings(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES -> { data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_day_types) - LibrusApiTeacherFreeDayTypes(data, onSuccess) + LibrusApiTeacherFreeDayTypes(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS -> { data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_days) - LibrusApiTeacherFreeDays(data, onSuccess) + LibrusApiTeacherFreeDays(data, lastSync, onSuccess) } /** @@ -161,11 +196,19 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) { */ ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK -> { data.startProgress(R.string.edziennik_progress_endpoint_homework) - LibrusSynergiaHomework(data, onSuccess) + LibrusSynergiaHomework(data, lastSync, onSuccess) } ENDPOINT_LIBRUS_SYNERGIA_INFO -> { data.startProgress(R.string.edziennik_progress_endpoint_student_info) - LibrusSynergiaInfo(data, onSuccess) + LibrusSynergiaInfo(data, lastSync, onSuccess) + } + ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_RECEIVED -> { + data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox) + LibrusSynergiaGetMessages(data, type = Message.TYPE_RECEIVED, lastSync = lastSync, onSuccess = onSuccess) + } + ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_SENT -> { + data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox) + LibrusSynergiaGetMessages(data, type = Message.TYPE_SENT, lastSync = lastSync, onSuccess = onSuccess) } /** @@ -173,14 +216,16 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) { */ ENDPOINT_LIBRUS_MESSAGES_RECEIVED -> { data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox) - LibrusMessagesGetList(data, type = Message.TYPE_RECEIVED, onSuccess = onSuccess) + if (data.messagesLoginSuccessful) LibrusMessagesGetList(data, type = Message.TYPE_RECEIVED, lastSync = lastSync, onSuccess = onSuccess) + else LibrusSynergiaGetMessages(data, type = Message.TYPE_RECEIVED, lastSync = lastSync, onSuccess = onSuccess) } ENDPOINT_LIBRUS_MESSAGES_SENT -> { data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox) - LibrusMessagesGetList(data, type = Message.TYPE_SENT, onSuccess = onSuccess) + if (data.messagesLoginSuccessful) LibrusMessagesGetList(data, type = Message.TYPE_SENT, lastSync = lastSync, onSuccess = onSuccess) + else LibrusSynergiaGetMessages(data, type = Message.TYPE_SENT, lastSync = lastSync, onSuccess = onSuccess) } - else -> onSuccess() + else -> onSuccess(endpointId) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusMessages.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusMessages.kt index 2915d4d7..dc8d8c47 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusMessages.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusMessages.kt @@ -5,13 +5,15 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data import com.google.gson.JsonObject +import com.google.gson.JsonParser import im.wangchao.mhttp.Request import im.wangchao.mhttp.Response import im.wangchao.mhttp.body.MediaTypeUtils import im.wangchao.mhttp.callback.FileCallbackHandler import im.wangchao.mhttp.callback.JsonCallbackHandler import im.wangchao.mhttp.callback.TextCallbackHandler -import okhttp3.Cookie +import org.json.JSONObject +import org.json.XML import org.jsoup.Jsoup import org.jsoup.nodes.Document import org.jsoup.parser.Parser @@ -27,7 +29,7 @@ import javax.xml.transform.TransformerFactory import javax.xml.transform.dom.DOMSource import javax.xml.transform.stream.StreamResult -open class LibrusMessages(open val data: DataLibrus) { +open class LibrusMessages(open val data: DataLibrus, open val lastSync: Long?) { companion object { private const val TAG = "LibrusMessages" } @@ -38,10 +40,10 @@ open class LibrusMessages(open val data: DataLibrus) { val profile get() = data.profile - fun messagesGet(tag: String, endpoint: String, method: Int = POST, + fun messagesGet(tag: String, module: String, method: Int = POST, parameters: Map? = null, onSuccess: (doc: Document) -> Unit) { - d(tag, "Request: Librus/Messages - $LIBRUS_MESSAGES_URL/$endpoint") + d(tag, "Request: Librus/Messages - $LIBRUS_MESSAGES_URL/$module") val callback = object : TextCallbackHandler() { override fun onSuccess(text: String?, response: Response?) { @@ -52,13 +54,20 @@ open class LibrusMessages(open val data: DataLibrus) { } when { - text.contains("Niepoprawny login i/lub hasło.") -> data.error(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN, response, text) - text.contains("stop.png") -> data.error(TAG, ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED, response, text) - text.contains("eAccessDeny") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text) - text.contains("OffLine") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_MAINTENANCE, response, text) - text.contains("error") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ERROR, response, text) - text.contains("eVarWhitThisNameNotExists") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text) - text.contains("") -> data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text) + text.contains("Niepoprawny login i/lub hasło.") -> ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN + text.contains("Nie odnaleziono wiadomości.") -> ERROR_LIBRUS_MESSAGES_NOT_FOUND + text.contains("stop.png") -> ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED + text.contains("eAccessDeny") -> ERROR_LIBRUS_MESSAGES_ACCESS_DENIED + text.contains("OffLine") -> ERROR_LIBRUS_MESSAGES_MAINTENANCE + text.contains("error") -> ERROR_LIBRUS_MESSAGES_ERROR + text.contains("eVarWhitThisNameNotExists") -> ERROR_LIBRUS_MESSAGES_ACCESS_DENIED + text.contains("") -> ERROR_LIBRUS_MESSAGES_OTHER + else -> null + }?.let { errorCode -> + data.error(ApiError(tag, errorCode) + .withApiResponse(text) + .withResponse(response)) + return } try { @@ -79,14 +88,7 @@ open class LibrusMessages(open val data: DataLibrus) { } } - data.app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name("DZIENNIKSID") - .value(data.messagesSessionId!!) - .domain("wiadomosci.librus.pl") - .secure().httpOnly().build() - )) - + data.app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", data.messagesSessionId) val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder() val doc = docBuilder.newDocument() @@ -107,22 +109,92 @@ open class LibrusMessages(open val data: DataLibrus) { transformer.transform(DOMSource(doc), StreamResult(stringWriter)) val requestXml = stringWriter.toString() - /*val requestXml = xml("service") { - "header" { } - "data" { - for ((key, value) in parameters.orEmpty()) { - key { - -value.toString() + Request.builder() + .url("$LIBRUS_MESSAGES_URL/$module") + .userAgent(SYNERGIA_USER_AGENT) + .setTextBody(requestXml, MediaTypeUtils.APPLICATION_XML) + .apply { + when (method) { + GET -> get() + POST -> post() } } + .callback(callback) + .build() + .enqueue() + } + + fun messagesGetJson(tag: String, module: String, method: Int = POST, + parameters: Map? = null, onSuccess: (json: JsonObject?) -> Unit) { + + d(tag, "Request: Librus/Messages - $LIBRUS_MESSAGES_URL/$module") + + val callback = object : TextCallbackHandler() { + override fun onSuccess(text: String?, response: Response?) { + if (text.isNullOrEmpty()) { + data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) + .withResponse(response)) + return + } + + when { + text.contains("Niepoprawny login i/lub hasło.") -> ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN + text.contains("Nie odnaleziono wiadomości.") -> ERROR_LIBRUS_MESSAGES_NOT_FOUND + text.contains("stop.png") -> ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED + text.contains("eAccessDeny") -> ERROR_LIBRUS_MESSAGES_ACCESS_DENIED + text.contains("OffLine") -> ERROR_LIBRUS_MESSAGES_MAINTENANCE + text.contains("error") -> ERROR_LIBRUS_MESSAGES_ERROR + text.contains("eVarWhitThisNameNotExists") -> ERROR_LIBRUS_MESSAGES_ACCESS_DENIED + text.contains("") -> ERROR_LIBRUS_MESSAGES_OTHER + else -> null + }?.let { errorCode -> + data.error(ApiError(tag, errorCode) + .withApiResponse(text) + .withResponse(response)) + return + } + + try { + val json: JSONObject? = XML.toJSONObject(text) + onSuccess(JsonParser().parse(json?.toString() ?: "{}")?.asJsonObject) + } catch (e: Exception) { + data.error(ApiError(tag, EXCEPTION_LIBRUS_MESSAGES_REQUEST) + .withResponse(response) + .withThrowable(e) + .withApiResponse(text)) + } } - }.toString(PrintOptions( - singleLineTextElements = true, - useSelfClosingTags = true - ))*/ + + override fun onFailure(response: Response?, throwable: Throwable?) { + data.error(ApiError(tag, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + } + + data.app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", data.messagesSessionId) + + val docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder() + val doc = docBuilder.newDocument() + val serviceElement = doc.createElement("service") + val headerElement = doc.createElement("header") + val dataElement = doc.createElement("data") + for ((key, value) in parameters.orEmpty()) { + val element = doc.createElement(key) + element.appendChild(doc.createTextNode(value.toString())) + dataElement.appendChild(element) + } + serviceElement.appendChild(headerElement) + serviceElement.appendChild(dataElement) + doc.appendChild(serviceElement) + val transformer = TransformerFactory.newInstance().newTransformer() + transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes") + val stringWriter = StringWriter() + transformer.transform(DOMSource(doc), StreamResult(stringWriter)) + val requestXml = stringWriter.toString() Request.builder() - .url("$LIBRUS_MESSAGES_URL/$endpoint") + .url("$LIBRUS_MESSAGES_URL/$module") .userAgent(SYNERGIA_USER_AGENT) .setTextBody(requestXml, MediaTypeUtils.APPLICATION_XML) .apply { @@ -180,10 +252,11 @@ open class LibrusMessages(open val data: DataLibrus) { .enqueue() } - fun sandboxGetFile(tag: String, action: String, targetFile: File, onSuccess: (file: File) -> Unit, + fun sandboxGetFile(tag: String, url: String, targetFile: File, onSuccess: (file: File) -> Unit, + method: Int = GET, onProgress: (written: Long, total: Long) -> Unit) { - d(tag, "Request: Librus/Messages - $LIBRUS_SANDBOX_URL$action") + d(tag, "Request: Librus/Messages - $url") val callback = object : FileCallbackHandler(targetFile) { override fun onSuccess(file: File?, response: Response?) { @@ -219,9 +292,14 @@ open class LibrusMessages(open val data: DataLibrus) { } Request.builder() - .url("$LIBRUS_SANDBOX_URL$action") + .url(url) .userAgent(SYNERGIA_USER_AGENT) - .post() + .also { + when (method) { + POST -> it.post() + else -> it.get() + } + } .callback(callback) .build() .enqueue() diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusPortal.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusPortal.kt index 48017438..4a5e0af6 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusPortal.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusPortal.kt @@ -44,6 +44,7 @@ open class LibrusPortal(open val data: DataLibrus) { "Access token is invalid" -> ERROR_LIBRUS_PORTAL_ACCESS_DENIED "ApiDisabled" -> ERROR_LIBRUS_PORTAL_API_DISABLED "Account not found" -> ERROR_LIBRUS_PORTAL_SYNERGIA_NOT_FOUND + "Unable to refresh the account" -> ERROR_LIBRUS_PORTAL_MAINTENANCE else -> when (json.getString("hint")) { "Error while decoding to JSON" -> ERROR_LIBRUS_PORTAL_ACCESS_DENIED else -> ERROR_LIBRUS_PORTAL_OTHER @@ -97,6 +98,7 @@ open class LibrusPortal(open val data: DataLibrus) { .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED) .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST) .allowErrorCode(HttpURLConnection.HTTP_GONE) + .allowErrorCode(424) .callback(callback) .build() .enqueue() diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusSynergia.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusSynergia.kt index d748cb13..72faf801 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusSynergia.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusSynergia.kt @@ -12,7 +12,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.models.ApiError import pl.szczodrzynski.edziennik.utils.Utils.d -open class LibrusSynergia(open val data: DataLibrus) { +open class LibrusSynergia(open val data: DataLibrus, open val lastSync: Long?) { companion object { private const val TAG = "LibrusSynergia" } @@ -35,7 +35,7 @@ open class LibrusSynergia(open val data: DataLibrus) { return } - if (!text.contains("jesteś zalogowany")) { + if (!text.contains("jesteś zalogowany") && !text.contains("Podgląd zadania")) { when { text.contains("stop.png") -> ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED text.contains("Przerwa techniczna") -> ERROR_LIBRUS_SYNERGIA_MAINTENANCE @@ -48,7 +48,6 @@ open class LibrusSynergia(open val data: DataLibrus) { } } - try { onSuccess(text) } catch (e: Exception) { @@ -90,4 +89,44 @@ open class LibrusSynergia(open val data: DataLibrus) { .build() .enqueue() } + + fun redirectUrlGet(tag: String, url: String, onSuccess: (url: String) -> Unit) { + d(tag, "Request: Librus/Synergia - $url") + + val callback = object : TextCallbackHandler() { + override fun onSuccess(text: String?, response: Response) { + val redirectUrl = response.headers().get("Location") + + if (redirectUrl != null) { + try { + onSuccess(redirectUrl) + } catch (e: Exception) { + data.error(ApiError(tag, EXCEPTION_LIBRUS_SYNERGIA_REQUEST) + .withResponse(response) + .withThrowable(e) + .withApiResponse(text)) + } + } else { + data.error(ApiError(tag, ERROR_LIBRUS_SYNERGIA_OTHER) + .withResponse(response) + .withApiResponse(text)) + } + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + data.error(ApiError(tag, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + } + + Request.builder() + .url(url) + .userAgent(LIBRUS_USER_AGENT) + .withClient(data.app.httpLazy) + .get() + .callback(callback) + .build() + .enqueue() + } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncementMarkAsRead.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncementMarkAsRead.kt new file mode 100644 index 00000000..23cfceb4 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncementMarkAsRead.kt @@ -0,0 +1,45 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-27 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api + +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.data.api.ERROR_LIBRUS_API_INVALID_REQUEST_PARAMS +import pl.szczodrzynski.edziennik.data.api.ERROR_LIBRUS_API_NOTICEBOARD_PROBLEM +import pl.szczodrzynski.edziennik.data.api.POST +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi +import pl.szczodrzynski.edziennik.data.api.events.AnnouncementGetEvent +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull + +class LibrusApiAnnouncementMarkAsRead(override val data: DataLibrus, + private val announcement: AnnouncementFull, + val onSuccess: () -> Unit +) : LibrusApi(data, null) { + companion object { + const val TAG = "LibrusApiAnnouncementMarkAsRead" + } + + init { + apiGet(TAG, "SchoolNotices/MarkAsRead/${announcement.idString}", method = POST, + ignoreErrors = listOf( + ERROR_LIBRUS_API_INVALID_REQUEST_PARAMS, + ERROR_LIBRUS_API_NOTICEBOARD_PROBLEM + )) { + announcement.seen = true + + EventBus.getDefault().postSticky(AnnouncementGetEvent(announcement)) + + data.setSeenMetadataList.add(Metadata( + profileId, + Metadata.TYPE_ANNOUNCEMENT, + announcement.id, + announcement.seen, + announcement.notified + )) + onSuccess() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncements.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncements.kt index 2dd3a5ec..d19be231 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncements.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAnnouncements.kt @@ -8,23 +8,26 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ANNOUNCEMENTS import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Announcement +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS import pl.szczodrzynski.edziennik.utils.models.Date class LibrusApiAnnouncements(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiAnnouncements" } init { data.profile?.also { profile -> apiGet(TAG, "SchoolNotices") { json -> - val announcements = json.getJsonArray("SchoolNotices").asJsonObjectList() + val announcements = json.getJsonArray("SchoolNotices")?.asJsonObjectList() announcements?.forEach { announcement -> - val id = announcement.getString("Id")?.crc32() ?: return@forEach + val longId = announcement.getString("Id") ?: return@forEach + val id = longId.crc32() val subject = announcement.getString("Subject") ?: "" val text = announcement.getString("Content") ?: "" val startDate = Date.fromY_m_d(announcement.getString("StartDate")) @@ -35,28 +38,30 @@ class LibrusApiAnnouncements(override val data: DataLibrus, val read = announcement.getBoolean("WasRead") ?: false val announcementObject = Announcement( - profileId, - id, - subject, - text, - startDate, - endDate, - teacherId - ) + profileId = profileId, + id = id, + subject = subject, + text = text, + startDate = startDate, + endDate = endDate, + teacherId = teacherId, + addedDate = addedDate + ).also { + it.idString = longId + } data.announcementList.add(announcementObject) - data.metadataList.add(Metadata( + data.setSeenMetadataList.add(Metadata( profileId, Metadata.TYPE_ANNOUNCEMENT, id, read, - profile.empty || read, - addedDate + profile.empty || read )) } data.setSyncNext(ENDPOINT_LIBRUS_API_ANNOUNCEMENTS, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_ANNOUNCEMENTS) } }} } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendanceTypes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendanceTypes.kt index 2d85e1fa..c620d13d 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendanceTypes.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendanceTypes.kt @@ -9,41 +9,57 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance -import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceType +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.entity.AttendanceType class LibrusApiAttendanceTypes(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiAttendanceTypes" } init { apiGet(TAG, "Attendances/Types") { json -> - val attendanceTypes = json.getJsonArray("Types").asJsonObjectList() + val attendanceTypes = json.getJsonArray("Types")?.asJsonObjectList() attendanceTypes?.forEach { attendanceType -> val id = attendanceType.getLong("Id") ?: return@forEach - val name = attendanceType.getString("Name") ?: "" - val color = attendanceType.getString("ColorRGB")?.let { Color.parseColor("#$it") } ?: -1 - val standardId = when (attendanceType.getBoolean("Standard") ?: false) { - true -> id - false -> attendanceType.getJsonObject("StandardType")?.getLong("Id") ?: id - } - val type = when (standardId) { + val typeName = attendanceType.getString("Name") ?: "" + val typeSymbol = attendanceType.getString("Short") ?: "" + val typeColor = attendanceType.getString("ColorRGB")?.let { Color.parseColor("#$it") } + + val isStandard = attendanceType.getBoolean("Standard") ?: false + val baseType = when (attendanceType.getJsonObject("StandardType")?.getLong("Id") ?: id) { 1L -> Attendance.TYPE_ABSENT 2L -> Attendance.TYPE_BELATED 3L -> Attendance.TYPE_ABSENT_EXCUSED 4L -> Attendance.TYPE_RELEASED - /*100*/else -> Attendance.TYPE_PRESENT + /*100*/else -> when (isStandard) { + true -> Attendance.TYPE_PRESENT + false -> Attendance.TYPE_PRESENT_CUSTOM + } + } + val typeShort = when (isStandard) { + true -> data.app.attendanceManager.getTypeShort(baseType) + false -> typeSymbol } - data.attendanceTypes.put(id, AttendanceType(profileId, id, name, type, color)) + data.attendanceTypes.put(id, AttendanceType( + profileId, + id, + baseType, + typeName, + typeShort, + typeSymbol, + typeColor + )) } - data.setSyncNext(ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES, 4*DAY) - onSuccess() + data.setSyncNext(ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES, 2*DAY) + onSuccess(ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendances.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendances.kt index bbc0d26e..7857dc2a 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendances.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiAttendances.kt @@ -9,14 +9,15 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ATTENDANCES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.utils.Utils +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS import pl.szczodrzynski.edziennik.utils.models.Date class LibrusApiAttendances(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiAttendances" } @@ -25,54 +26,65 @@ class LibrusApiAttendances(override val data: DataLibrus, if (data.attendanceTypes.isEmpty()) { data.db.attendanceTypeDao().getAllNow(profileId).toSparseArray(data.attendanceTypes) { it.id } } + if (data.librusLessons.isEmpty()) { + data.db.librusLessonDao().getAllNow(profileId).toSparseArray(data.librusLessons) { it.lessonId } + } apiGet(TAG, "Attendances") { json -> - val attendances = json.getJsonArray("Attendances").asJsonObjectList() + val attendances = json.getJsonArray("Attendances")?.asJsonObjectList() attendances?.forEach { attendance -> - val id = Utils.strToInt((attendance.getString("Id") ?: return@forEach) + val id = ((attendance.getString("Id") ?: return@forEach) .replace("[^\\d.]".toRegex(), "")).toLong() - val teacherId = attendance.getJsonObject("AddedBy")?.getLong("Id") ?: -1 + val lessonId = attendance.getJsonObject("Lesson")?.getLong("Id") ?: -1 val lessonNo = attendance.getInt("LessonNo") ?: return@forEach - val startTime = data.lessonRanges.get(lessonNo).startTime val lessonDate = Date.fromY_m_d(attendance.getString("Date")) + val teacherId = attendance.getJsonObject("AddedBy")?.getLong("Id") val semester = attendance.getInt("Semester") ?: return@forEach - val type = attendance.getJsonObject("Type")?.getLong("Id") ?: return@forEach - val typeObject = data.attendanceTypes.get(type) - val topic = typeObject?.name ?: "" - val lessonList = data.db.timetableDao().getForDateNow(profileId, lessonDate) - val subjectId = lessonList.firstOrNull { it.startTime == startTime }?.subjectId ?: -1 + val typeId = attendance.getJsonObject("Type")?.getLong("Id") ?: return@forEach + val type = data.attendanceTypes[typeId] ?: null - val attendanceObject = Attendance( - profileId, - id, - teacherId, - subjectId, - semester, - topic, - lessonDate, - startTime, - typeObject.type - ) + val startTime = data.lessonRanges.get(lessonNo)?.startTime + + val lesson = if (lessonId != -1L) + data.librusLessons.singleOrNull { it.lessonId == lessonId } + else null val addedDate = Date.fromIso(attendance.getString("AddDate") ?: return@forEach) + val attendanceObject = Attendance( + profileId = profileId, + id = id, + baseType = type?.baseType ?: Attendance.TYPE_UNKNOWN, + typeName = type?.typeName ?: "nieznany rodzaj", + typeShort = type?.typeShort ?: "?", + typeSymbol = type?.typeSymbol ?: "?", + typeColor = type?.typeColor, + date = lessonDate, + startTime = startTime, + semester = semester, + teacherId = teacherId ?: lesson?.teacherId ?: -1, + subjectId = lesson?.subjectId ?: -1, + addedDate = addedDate + ).also { + it.lessonNumber = lessonNo + } + data.attendanceList.add(attendanceObject) - if(typeObject.type != Attendance.TYPE_PRESENT) { + if(type?.baseType != Attendance.TYPE_PRESENT) { data.metadataList.add(Metadata( profileId, Metadata.TYPE_ATTENDANCE, id, - profile?.empty ?: false, - profile?.empty ?: false, - addedDate + profile?.empty ?: false || type?.baseType == Attendance.TYPE_PRESENT_CUSTOM || type?.baseType == Attendance.TYPE_UNKNOWN, + profile?.empty ?: false || type?.baseType == Attendance.TYPE_PRESENT_CUSTOM || type?.baseType == Attendance.TYPE_UNKNOWN )) } } data.setSyncNext(ENDPOINT_LIBRUS_API_ATTENDANCES, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_ATTENDANCES) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeCategories.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeCategories.kt index c12499ef..650dfbb5 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeCategories.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeCategories.kt @@ -9,10 +9,12 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory class LibrusApiBehaviourGradeCategories(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiBehaviourGradeCategories" } @@ -40,7 +42,7 @@ class LibrusApiBehaviourGradeCategories(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES, 1 * WEEK) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeComments.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeComments.kt index 43a4d5f9..eedb1d1d 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeComments.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGradeComments.kt @@ -8,11 +8,13 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_COMMENTS import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS class LibrusApiBehaviourGradeComments(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiBehaviourGradeComments" } @@ -38,7 +40,7 @@ class LibrusApiBehaviourGradeComments(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_COMMENTS, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_COMMENTS) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGrades.kt index 33f6ab5d..fae79a50 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGrades.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiBehaviourGrades.kt @@ -8,71 +8,94 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_POINT_SUM +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS import pl.szczodrzynski.edziennik.utils.models.Date import java.text.DecimalFormat class LibrusApiBehaviourGrades(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiBehaviourGrades" } private val nameFormat by lazy { DecimalFormat("#.##") } - init { data.profile?.let { profile -> + private val types by lazy { + mapOf( + 1 to ("wz" to "wzorowe"), + 2 to ("bdb" to "bardzo dobre"), + 3 to ("db" to "dobre"), + 4 to ("popr" to "poprawne"), + 5 to ("ndp" to "nieodpowiednie"), + 6 to ("ng" to "naganne") + ) + } + + init { data.profile?.also { profile -> apiGet(TAG, "BehaviourGrades/Points") { json -> - val semester1StartGradeObject = Grade( - profileId, - -101, - data.app.getString(R.string.grade_start_points), - 0xffbdbdbd.toInt(), - data.app.getString(R.string.grade_start_points_format, 1), - nameFormat.format(data.startPointsSemester1), - data.startPointsSemester1.toFloat(), - -1f, - 1, - -1, - 1 - ).apply { type = Grade.TYPE_BEHAVIOUR } + if (data.startPointsSemester1 > 0) { + val semester1StartGradeObject = Grade( + profileId = profileId, + id = -101, + name = nameFormat.format(data.startPointsSemester1), + type = TYPE_POINT_SUM, + value = data.startPointsSemester1.toFloat(), + weight = 0f, + color = 0xffbdbdbd.toInt(), + category = data.app.getString(R.string.grade_start_points), + description = data.app.getString(R.string.grade_start_points_format, 1), + comment = null, + semester = 1, + teacherId = -1, + subjectId = 1, + addedDate = profile.getSemesterStart(1).inMillis + ) - data.gradeList.add(semester1StartGradeObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_GRADE, - semester1StartGradeObject.id, - true, - true, - profile.getSemesterStart(1).inMillis - )) + data.gradeList.add(semester1StartGradeObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_GRADE, + semester1StartGradeObject.id, + true, + true + )) + } - val semester2StartGradeObject = Grade( - profileId, - -102, - data.app.getString(R.string.grade_start_points), - 0xffbdbdbd.toInt(), - data.app.getString(R.string.grade_start_points_format, 2), - nameFormat.format(data.startPointsSemester2), - data.startPointsSemester2.toFloat(), - -1f, - 2, - -1, - 1 - ).apply { type = Grade.TYPE_BEHAVIOUR } + if (data.startPointsSemester2 > 0) { + val semester2StartGradeObject = Grade( + profileId = profileId, + id = -102, + name = nameFormat.format(data.startPointsSemester2), + type = TYPE_POINT_SUM, + value = data.startPointsSemester2.toFloat(), + weight = -1f, + color = 0xffbdbdbd.toInt(), + category = data.app.getString(R.string.grade_start_points), + description = data.app.getString(R.string.grade_start_points_format, 2), + comment = null, + semester = 2, + teacherId = -1, + subjectId = 1, + addedDate = profile.getSemesterStart(2).inMillis + ) - data.gradeList.add(semester2StartGradeObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_GRADE, - semester2StartGradeObject.id, - true, - true, - profile.getSemesterStart(2).inMillis - )) + data.gradeList.add(semester2StartGradeObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_GRADE, + semester2StartGradeObject.id, + true, + true + )) + } json.getJsonArray("Grades")?.asJsonObjectList()?.forEach { grade -> val id = grade.getLong("Id") ?: return@forEach @@ -83,8 +106,12 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus, val addedDate = grade.getString("AddDate")?.let { Date.fromIso(it) } ?: System.currentTimeMillis() + val text = grade.getString("Text") + val type = grade.getJsonObject("BehaviourGrade")?.getInt("Id")?.let { types[it] } + val name = when { - value != null -> (if (value >= 0) "+" else "") + nameFormat.format(value) + type != null -> type.first + value != null -> (if (value > 0) "+" else "") + nameFormat.format(value) shortName != null -> shortName else -> return@forEach } @@ -103,32 +130,34 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus, val categoryName = category?.text ?: "" - val description = grade.getJsonArray("Comments")?.asJsonObjectList()?.let { comments -> - if (comments.isNotEmpty()) { - data.gradeCategories.singleOrNull { - it.type == GradeCategory.TYPE_BEHAVIOUR_COMMENT - && it.categoryId == comments[0].asJsonObject.getLong("Id") - }?.text - } else null - } ?: "" + val comments = grade.getJsonArray("Comments") + ?.asJsonObjectList() + ?.mapNotNull { comment -> + val cId = comment.getLong("Id") ?: return@mapNotNull null + data.gradeCategories[cId]?.text + } ?: listOf() + + val description = listOfNotNull(type?.second) + comments val valueFrom = value ?: category?.valueFrom ?: 0f val valueTo = category?.valueTo ?: 0f val gradeObject = Grade( - profileId, - id, - categoryName, - color, - description, - name, - valueFrom, - -1f, - semester, - teacherId, - 1 + profileId = profileId, + id = id, + name = name, + type = TYPE_POINT_SUM, + value = valueFrom, + weight = -1f, + color = color, + category = categoryName, + description = text ?: description.join(" - "), + comment = if (text != null) description.join(" - ") else null, + semester = semester, + teacherId = teacherId, + subjectId = 1, + addedDate = addedDate ).apply { - type = Grade.TYPE_BEHAVIOUR valueMax = valueTo } @@ -138,13 +167,13 @@ class LibrusApiBehaviourGrades(override val data: DataLibrus, Metadata.TYPE_GRADE, id, profile.empty, - profile.empty, - addedDate + profile.empty )) } + data.toRemove.add(DataRemoveModel.Grades.semesterWithType(profile.currentSemester, Grade.TYPE_POINT_SUM)) data.setSyncNext(ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES) } - }} + } ?: onSuccess(ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClasses.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClasses.kt index 6f497021..171e80e1 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClasses.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClasses.kt @@ -8,14 +8,16 @@ import pl.szczodrzynski.edziennik.DAY import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_CLASSES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team +import pl.szczodrzynski.edziennik.data.db.entity.Team import pl.szczodrzynski.edziennik.getJsonObject import pl.szczodrzynski.edziennik.getLong import pl.szczodrzynski.edziennik.getString import pl.szczodrzynski.edziennik.utils.models.Date class LibrusApiClasses(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiClasses" } @@ -38,6 +40,8 @@ class LibrusApiClasses(override val data: DataLibrus, teacherId ) + data.profile?.studentClassName = name + data.teamList.put(id, teamObject) data.unitId = studentClass.getJsonObject("Unit").getLong("Id") ?: 0L @@ -53,7 +57,7 @@ class LibrusApiClasses(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_CLASSES, 4 * DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_CLASSES) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClassrooms.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClassrooms.kt index 422321ca..80a11105 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClassrooms.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiClassrooms.kt @@ -8,26 +8,29 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_CLASSROOMS import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.classrooms.Classroom +import pl.szczodrzynski.edziennik.data.db.entity.Classroom import java.util.* class LibrusApiClassrooms(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiClassrooms" } init { apiGet(TAG, "Classrooms") { json -> - val classrooms = json.getJsonArray("Classrooms").asJsonObjectList() + val classrooms = json.getJsonArray("Classrooms")?.asJsonObjectList() classrooms?.forEach { classroom -> val id = classroom.getLong("Id") ?: return@forEach val name = classroom.getString("Name")?.toLowerCase(Locale.getDefault()) ?: "" val symbol = classroom.getString("Symbol")?.toLowerCase(Locale.getDefault()) ?: "" - val nameShort = name.split(" ").onEach { it[0] }.joinToString() + val nameShort = name.fixWhiteSpaces().split(" ").onEach { it[0] }.joinToString() + val symbolParts = symbol.fixWhiteSpaces().split(" ") - val friendlyName = if (name != symbol && !name.contains(symbol) && !nameShort.contains(symbol)) { + val friendlyName = if (name != symbol && !name.contains(symbol) && !name.containsAll(symbolParts) && !nameShort.contains(symbol)) { classroom.getString("Symbol") + " " + classroom.getString("Name") } else { @@ -38,7 +41,7 @@ class LibrusApiClassrooms(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_CLASSROOMS, 4*DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_CLASSROOMS) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGradeCategories.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGradeCategories.kt new file mode 100644 index 00000000..94ce6972 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGradeCategories.kt @@ -0,0 +1,47 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-29 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api + +import android.graphics.Color +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory + +class LibrusApiDescriptiveGradeCategories(override val data: DataLibrus, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { + companion object { + const val TAG = "LibrusApiDescriptiveGradeCategories" + } + + init { + apiGet(TAG, "DescriptiveTextGrades/Skills") { json -> + json.getJsonArray("Skills")?.asJsonObjectList()?.forEach { category -> + val id = category.getLong("Id") ?: return@forEach + val name = category.getString("Name") ?: "" + val color = category.getJsonObject("Color")?.getInt("Id") + ?.let { data.getColor(it) } ?: Color.BLUE + + val gradeCategoryObject = GradeCategory( + profileId, + id, + -1f, + color, + name + ).apply { + type = GradeCategory.TYPE_DESCRIPTIVE + } + + data.gradeCategories.put(id, gradeCategoryObject) + } + + data.setSyncNext(ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES, 1 * DAY) + onSuccess(ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGrades.kt new file mode 100644 index 00000000..8cc4f1c1 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiDescriptiveGrades.kt @@ -0,0 +1,93 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-29 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api + +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_DESCRIPTIVE_TEXT +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_TEXT +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.utils.models.Date + +class LibrusApiDescriptiveGrades(override val data: DataLibrus, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { + companion object { + const val TAG = "LibrusApiDescriptiveGrades" + } + + init { data.profile?.also { profile -> + apiGet(TAG, "BaseTextGrades") { json -> + + json.getJsonArray("Grades")?.asJsonObjectList()?.forEach { grade -> + val id = grade.getLong("Id") ?: return@forEach + val teacherId = grade.getJsonObject("AddedBy")?.getLong("Id") ?: return@forEach + val semester = grade.getInt("Semester") ?: return@forEach + val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: return@forEach + val description = grade.getString("Grade") + + val categoryId = grade.getJsonObject("Skill")?.getLong("Id") + ?: grade.getJsonObject("Category")?.getLong("Id") + ?: return@forEach + val type = when (grade.getJsonObject("Category")) { + null -> TYPE_DESCRIPTIVE_TEXT + else -> TYPE_TEXT + } + + val category = data.gradeCategories.singleOrNull { + it.categoryId == categoryId && it.type == when (type) { + TYPE_DESCRIPTIVE_TEXT -> GradeCategory.TYPE_DESCRIPTIVE + else -> GradeCategory.TYPE_NORMAL + } + } + + val addedDate = Date.fromIso(grade.getString("AddDate") ?: return@forEach) + + val gradeObject = Grade( + profileId = profileId, + id = id, + name = " ", + type = type, + value = 0f, + weight = 0f, + color = category?.color ?: -1, + category = category?.text, + description = description, + comment = null, + semester = semester, + teacherId = teacherId, + subjectId = subjectId, + addedDate = addedDate + ) + + data.gradeList.add(gradeObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_GRADE, + id, + profile.empty, + profile.empty + )) + } + + data.toRemove.addAll(listOf( + TYPE_DESCRIPTIVE_TEXT, + TYPE_TEXT + ).map { + DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it) + }) + + data.setSyncNext(ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES, SYNC_ALWAYS) + onSuccess(ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES) + } + } ?: onSuccess(ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEventTypes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEventTypes.kt index 48c479c1..331b8249 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEventTypes.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEventTypes.kt @@ -8,17 +8,19 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_EVENT_TYPES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.events.EventType +import pl.szczodrzynski.edziennik.data.db.entity.EventType class LibrusApiEventTypes(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiEventTypes" } init { apiGet(TAG, "HomeWorks/Categories") { json -> - val eventTypes = json.getJsonArray("Categories").asJsonObjectList() + val eventTypes = json.getJsonArray("Categories")?.asJsonObjectList() eventTypes?.forEach { eventType -> val id = eventType.getLong("Id") ?: return@forEach @@ -29,7 +31,7 @@ class LibrusApiEventTypes(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_EVENT_TYPES, 4*DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_EVENT_TYPES) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt index 7b87c462..7a76f88e 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiEvents.kt @@ -10,14 +10,16 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_EVENTS import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time class LibrusApiEvents(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiEvents" } @@ -28,13 +30,13 @@ class LibrusApiEvents(override val data: DataLibrus, } apiGet(TAG, "HomeWorks") { json -> - val events = json.getJsonArray("HomeWorks").asJsonObjectList() + val events = json.getJsonArray("HomeWorks")?.asJsonObjectList() events?.forEach { event -> val id = event.getLong("Id") ?: return@forEach val eventDate = Date.fromY_m_d(event.getString("Date")) - val topic = event.getString("Content") ?: "" - val type = event.getJsonObject("Category")?.getInt("Id") ?: -1 + var topic = event.getString("Content")?.trim() ?: "" + val type = event.getJsonObject("Category")?.getLong("Id") ?: -1 val teacherId = event.getJsonObject("CreatedBy")?.getLong("Id") ?: -1 val subjectId = event.getJsonObject("Subject")?.getLong("Id") ?: -1 val teamId = event.getJsonObject("Class")?.getLong("Id") ?: -1 @@ -44,18 +46,24 @@ class LibrusApiEvents(override val data: DataLibrus, val startTime = lessonRange?.startTime ?: Time.fromH_m(event.getString("TimeFrom")) val addedDate = Date.fromIso(event.getString("AddDate")) + event.getJsonObject("onlineLessonUrl")?.let { onlineLesson -> + val text = onlineLesson.getString("text")?.let { "$it - " } ?: "" + val url = onlineLesson.getString("url") + topic += "\n\n$text$url" + } + val eventObject = Event( - profileId, - id, - eventDate, - startTime, - topic, - -1, - type, - false, - teacherId, - subjectId, - teamId + profileId = profileId, + id = id, + date = eventDate, + time = startTime, + topic = topic, + color = null, + type = type, + teacherId = teacherId, + subjectId = subjectId, + teamId = teamId, + addedDate = addedDate ) data.eventList.add(eventObject) @@ -65,15 +73,17 @@ class LibrusApiEvents(override val data: DataLibrus, Metadata.TYPE_EVENT, id, profile?.empty ?: false, - profile?.empty ?: false, - addedDate + profile?.empty ?: false )) } - data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK)) + data.toRemove.add(DataRemoveModel.Events.futureExceptTypes(listOf( + Event.TYPE_HOMEWORK, + Event.TYPE_PT_MEETING + ))) data.setSyncNext(ENDPOINT_LIBRUS_API_EVENTS, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_EVENTS) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeCategories.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeCategories.kt index 1e4b7151..518e643f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeCategories.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeCategories.kt @@ -9,11 +9,13 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADE_CATEGORIES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS class LibrusApiGradeCategories(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiGradeCategories" } @@ -42,7 +44,7 @@ class LibrusApiGradeCategories(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_NORMAL_GRADE_CATEGORIES, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_NORMAL_GRADE_CATEGORIES) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeComments.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeComments.kt index 05031612..971ac35b 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeComments.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGradeComments.kt @@ -8,11 +8,13 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS class LibrusApiGradeComments(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiGradeComments" } @@ -38,7 +40,7 @@ class LibrusApiGradeComments(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGrades.kt index 9cd0b267..c2e2d0ce 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGrades.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiGrades.kt @@ -4,22 +4,32 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NORMAL_GRADES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_NORMAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS import pl.szczodrzynski.edziennik.utils.Utils import pl.szczodrzynski.edziennik.utils.models.Date class LibrusApiGrades(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiGrades" } - init { + init { data.profile?.also { profile -> apiGet(TAG, "Grades") { json -> - val grades = json.getJsonArray("Grades").asJsonObjectList() + val grades = json.getJsonArray("Grades")?.asJsonObjectList() grades?.forEach { grade -> val id = grade.getLong("Id") ?: return@forEach @@ -30,19 +40,16 @@ class LibrusApiGrades(override val data: DataLibrus, val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: -1 val addedDate = Date.fromIso(grade.getString("AddDate")) - val category = data.gradeCategories.singleOrNull { it.categoryId == categoryId } - val categoryName = category?.text ?: "" - val color = category?.color ?: -1 - var weight = category?.weight ?: 0f - val value = Utils.getGradeValue(name) - - - if (name == "-" || name == "+" - || name.equals("np", ignoreCase = true) - || name.equals("bz", ignoreCase = true)) { - weight = 0f + val category = data.gradeCategories.singleOrNull { + it.categoryId == categoryId && it.type == GradeCategory.TYPE_NORMAL } + val value = Utils.getGradeValue(name) + val weight = if (name == "-" || name == "+" + || name.equals("np", ignoreCase = true) + || name.equals("bz", ignoreCase = true)) 0f + else category?.weight ?: 0f + val description = grade.getJsonArray("Comments")?.asJsonObjectList()?.let { comments -> if (comments.isNotEmpty()) { data.gradeCategories.singleOrNull { @@ -53,32 +60,29 @@ class LibrusApiGrades(override val data: DataLibrus, } ?: "" val gradeObject = Grade( - profileId, - id, - categoryName, - color, - description, - name, - value, - weight, - semester, - teacherId, - subjectId + profileId = profileId, + id = id, + name = name, + type = when { + grade.getBoolean("IsConstituent") ?: false -> TYPE_NORMAL + grade.getBoolean("IsSemester") ?: false -> if (semester == 1) TYPE_SEMESTER1_FINAL else TYPE_SEMESTER2_FINAL + grade.getBoolean("IsSemesterProposition") ?: false -> if (semester == 1) TYPE_SEMESTER1_PROPOSED else TYPE_SEMESTER2_PROPOSED + grade.getBoolean("IsFinal") ?: false -> TYPE_YEAR_FINAL + grade.getBoolean("IsFinalProposition") ?: false -> TYPE_YEAR_PROPOSED + else -> TYPE_NORMAL + }, + value = value, + weight = weight, + color = category?.color ?: -1, + category = category?.text ?: "", + description = description, + comment = null, + semester = semester, + teacherId = teacherId, + subjectId = subjectId, + addedDate = addedDate ) - when { - grade.getBoolean("IsConstituent") ?: false -> - gradeObject.type = Grade.TYPE_NORMAL - grade.getBoolean("IsSemester") ?: false -> // semester final - gradeObject.type = if (gradeObject.semester == 1) Grade.TYPE_SEMESTER1_FINAL else Grade.TYPE_SEMESTER2_FINAL - grade.getBoolean("IsSemesterProposition") ?: false -> // semester proposed - gradeObject.type = if (gradeObject.semester == 1) Grade.TYPE_SEMESTER1_PROPOSED else Grade.TYPE_SEMESTER2_PROPOSED - grade.getBoolean("IsFinal") ?: false -> // year final - gradeObject.type = Grade.TYPE_YEAR_FINAL - grade.getBoolean("IsFinalProposition") ?: false -> // year final - gradeObject.type = Grade.TYPE_YEAR_PROPOSED - } - grade.getJsonObject("Improvement")?.also { val historicalId = it.getLong("Id") data.gradeList.firstOrNull { grade -> grade.id == historicalId }?.also { grade -> @@ -94,14 +98,24 @@ class LibrusApiGrades(override val data: DataLibrus, profileId, Metadata.TYPE_GRADE, id, - profile?.empty ?: false, - profile?.empty ?: false, - addedDate + profile.empty, + profile.empty )) } + data.toRemove.addAll(listOf( + TYPE_NORMAL, + TYPE_SEMESTER1_FINAL, + TYPE_SEMESTER2_FINAL, + TYPE_SEMESTER1_PROPOSED, + TYPE_SEMESTER2_PROPOSED, + TYPE_YEAR_FINAL, + TYPE_YEAR_PROPOSED + ).map { + DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it) + }) data.setSyncNext(ENDPOINT_LIBRUS_API_NORMAL_GRADES, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_NORMAL_GRADES) } - } + } ?: onSuccess(ENDPOINT_LIBRUS_API_NORMAL_GRADES) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiHomework.kt index 16bbac1c..c1183c19 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiHomework.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiHomework.kt @@ -9,20 +9,22 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_HOMEWORK import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS import pl.szczodrzynski.edziennik.utils.models.Date class LibrusApiHomework(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiHomework" } init { apiGet(TAG, "HomeWorkAssignments") { json -> - val homeworkList = json.getJsonArray("HomeWorkAssignments").asJsonObjectList() + val homeworkList = json.getJsonArray("HomeWorkAssignments")?.asJsonObjectList() homeworkList?.forEach { homework -> val id = homework.getLong("Id") ?: return@forEach @@ -32,17 +34,17 @@ class LibrusApiHomework(override val data: DataLibrus, val addedDate = Date.fromY_m_d(homework.getString("Date")) val eventObject = Event( - profileId, - id, - eventDate, - null, - topic, - -1, - -1, - false, - teacherId, - -1, - -1 + profileId = profileId, + id = id, + date = eventDate, + time = null, + topic = topic, + color = null, + type = -1, + teacherId = teacherId, + subjectId = -1, + teamId = -1, + addedDate = addedDate.inMillis ) data.eventList.add(eventObject) @@ -51,15 +53,14 @@ class LibrusApiHomework(override val data: DataLibrus, Metadata.TYPE_HOMEWORK, id, profile?.empty ?: false, - profile?.empty ?: false, - addedDate.inMillis + profile?.empty ?: false )) } data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK)) data.setSyncNext(ENDPOINT_LIBRUS_API_HOMEWORK, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_HOMEWORK) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLessons.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLessons.kt new file mode 100644 index 00000000..e32790c9 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLessons.kt @@ -0,0 +1,46 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-6. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api + +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_LESSONS +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi +import pl.szczodrzynski.edziennik.data.db.entity.LibrusLesson + +class LibrusApiLessons(override val data: DataLibrus, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { + companion object { + const val TAG = "LibrusApiLessons" + } + + init { + apiGet(TAG, "Lessons") { json -> + val lessons = json.getJsonArray("Lessons")?.asJsonObjectList() + + lessons?.forEach { lesson -> + val id = lesson.getLong("Id") ?: return@forEach + val teacherId = lesson.getJsonObject("Teacher")?.getLong("Id") ?: return@forEach + val subjectId = lesson.getJsonObject("Subject")?.getLong("Id") ?: return@forEach + val teamId = lesson.getJsonObject("Class")?.getLong("Id") + + val librusLesson = LibrusLesson( + profileId, + id, + teacherId, + subjectId, + teamId + ) + + data.librusLessons.put(id, librusLesson) + } + + data.setSyncNext(ENDPOINT_LIBRUS_API_LESSONS, 4*DAY) + onSuccess(ENDPOINT_LIBRUS_API_LESSONS) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLuckyNumber.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLuckyNumber.kt index a272a5dd..80e6e299 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLuckyNumber.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiLuckyNumber.kt @@ -4,28 +4,24 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api -import pl.szczodrzynski.edziennik.DAY +import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_LUCKY_NUMBER import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.getInt -import pl.szczodrzynski.edziennik.getJsonObject -import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber +import pl.szczodrzynski.edziennik.data.db.entity.Metadata import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time class LibrusApiLuckyNumber(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiLuckyNumber" } init { - data.profile?.luckyNumber = -1 - data.profile?.luckyNumberDate = null - var nextSync = System.currentTimeMillis() + 2*DAY*1000 apiGet(TAG, "LuckyNumbers") { json -> @@ -37,14 +33,15 @@ class LibrusApiLuckyNumber(override val data: DataLibrus, val luckyNumberDate = Date.fromY_m_d(luckyNumberEl.getString("LuckyNumberDay")) ?: Date.getToday() val luckyNumber = luckyNumberEl.getInt("LuckyNumber") ?: -1 val luckyNumberObject = LuckyNumber( - profileId, - luckyNumberDate, - luckyNumber + profileId = profileId, + date = luckyNumberDate, + number = luckyNumber ) - //if (luckyNumberDate > Date.getToday()) { + if (luckyNumberDate >= Date.getToday()) nextSync = luckyNumberDate.combineWith(Time(15, 0, 0)) - //} + else + nextSync = System.currentTimeMillis() + 6*HOUR*1000 data.luckyNumberList.add(luckyNumberObject) data.metadataList.add( @@ -52,15 +49,14 @@ class LibrusApiLuckyNumber(override val data: DataLibrus, profileId, Metadata.TYPE_LUCKY_NUMBER, luckyNumberObject.date.value.toLong(), - profile?.empty ?: false, - profile?.empty ?: false, - System.currentTimeMillis() + true, + profile?.empty ?: false )) } } data.setSyncNext(ENDPOINT_LIBRUS_API_LUCKY_NUMBER, syncAt = nextSync) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_LUCKY_NUMBER) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiMe.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiMe.kt index c226cf58..9d5ce1d4 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiMe.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiMe.kt @@ -10,7 +10,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi class LibrusApiMe(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiMe" } @@ -24,7 +26,7 @@ class LibrusApiMe(override val data: DataLibrus, data.isPremium = account?.getBoolean("IsPremium") == true || account?.getBoolean("IsPremiumDemo") == true val isParent = account?.getInt("GroupId") == 5 - data.profile?.accountNameLong = + data.profile?.accountName = if (isParent) buildFullName(account?.getString("FirstName"), account?.getString("LastName")) else null @@ -33,7 +35,7 @@ class LibrusApiMe(override val data: DataLibrus, buildFullName(user?.getString("FirstName"), user?.getString("LastName")) data.setSyncNext(ENDPOINT_LIBRUS_API_ME, 2*DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_ME) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNoticeTypes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNoticeTypes.kt index 14f251b6..55e753ee 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNoticeTypes.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNoticeTypes.kt @@ -8,17 +8,19 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NOTICE_TYPES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType +import pl.szczodrzynski.edziennik.data.db.entity.NoticeType class LibrusApiNoticeTypes(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiNoticeTypes" } init { apiGet(TAG, "Notes/Categories") { json -> - val noticeTypes = json.getJsonArray("Categories").asJsonObjectList() + val noticeTypes = json.getJsonArray("Categories")?.asJsonObjectList() noticeTypes?.forEach { noticeType -> val id = noticeType.getLong("Id") ?: return@forEach @@ -28,7 +30,7 @@ class LibrusApiNoticeTypes(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_NOTICE_TYPES, 4*DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_NOTICE_TYPES) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt index 7d2036ca..ba531afe 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiNotices.kt @@ -9,13 +9,15 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_NOTICES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Notice +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS import pl.szczodrzynski.edziennik.utils.models.Date class LibrusApiNotices(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiNotices" } @@ -26,7 +28,7 @@ class LibrusApiNotices(override val data: DataLibrus, } apiGet(TAG, "Notes") { json -> - val notes = json.getJsonArray("Notes").asJsonObjectList() + val notes = json.getJsonArray("Notes")?.asJsonObjectList() notes?.forEach { note -> val id = note.getLong("Id") ?: return@forEach @@ -44,12 +46,15 @@ class LibrusApiNotices(override val data: DataLibrus, val semester = profile?.dateToSemester(addedDate) ?: 1 val noticeObject = Notice( - profileId, - id, - categoryText+"\n"+text, - semester, - type, - teacherId + profileId = profileId, + id = id, + type = type, + semester = semester, + text = text, + category = categoryText, + points = null, + teacherId = teacherId, + addedDate = addedDate.inMillis ) data.noticeList.add(noticeObject) @@ -59,13 +64,12 @@ class LibrusApiNotices(override val data: DataLibrus, Metadata.TYPE_NOTICE, id, profile?.empty ?: false, - profile?.empty ?: false, - addedDate.inMillis + profile?.empty ?: false )) } data.setSyncNext(ENDPOINT_LIBRUS_API_NOTICES, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_NOTICES) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGradeCategories.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGradeCategories.kt new file mode 100644 index 00000000..bba6ead9 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGradeCategories.kt @@ -0,0 +1,52 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-29 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api + +import android.graphics.Color +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory + +class LibrusApiPointGradeCategories(override val data: DataLibrus, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { + companion object { + const val TAG = "LibrusApiPointGradeCategories" + } + + init { + apiGet(TAG, "PointGrades/Categories") { json -> + json.getJsonArray("Categories")?.asJsonObjectList()?.forEach { category -> + val id = category.getLong("Id") ?: return@forEach + val name = category.getString("Name") ?: "" + val color = category.getJsonObject("Color")?.getInt("Id") + ?.let { data.getColor(it) } ?: Color.BLUE + val countToAverage = category.getBoolean("CountToTheAverage") ?: true + val weight = if (countToAverage) category.getFloat("Weight") ?: 0f else 0f + val valueFrom = category.getFloat("ValueFrom") ?: 0f + val valueTo = category.getFloat("ValueTo") ?: 0f + + val gradeCategoryObject = GradeCategory( + profileId, + id, + weight, + color, + name + ).apply { + type = GradeCategory.TYPE_POINT + setValueRange(valueFrom, valueTo) + } + + data.gradeCategories.put(id, gradeCategoryObject) + } + + data.setSyncNext(ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES, 1 * DAY) + onSuccess(ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGrades.kt new file mode 100644 index 00000000..9da2c435 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPointGrades.kt @@ -0,0 +1,81 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-29 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api + +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_POINT_GRADES +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_POINT_AVG +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.utils.models.Date + +class LibrusApiPointGrades(override val data: DataLibrus, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { + companion object { + const val TAG = "LibrusApiPointGrades" + } + + init { data.profile?.also { profile -> + apiGet(TAG, "PointGrades") { json -> + + json.getJsonArray("Grades")?.asJsonObjectList()?.forEach { grade -> + val id = grade.getLong("Id") ?: return@forEach + val teacherId = grade.getJsonObject("AddedBy")?.getLong("Id") ?: return@forEach + val semester = grade.getInt("Semester") ?: return@forEach + val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: return@forEach + val name = grade.getString("Grade") ?: return@forEach + val value = grade.getFloat("GradeValue") ?: 0f + + val categoryId = grade.getJsonObject("Category")?.getLong("Id") ?: return@forEach + + val category = data.gradeCategories.singleOrNull { + it.categoryId == categoryId && it.type == GradeCategory.TYPE_POINT + } + + val addedDate = Date.fromIso(grade.getString("AddDate") ?: return@forEach) + + val gradeObject = Grade( + profileId = profileId, + id = id, + name = name, + type = TYPE_POINT_AVG, + value = value, + weight = category?.weight ?: 0f, + color = category?.color ?: -1, + category = category?.text ?: "", + description = null, + comment = null, + semester = semester, + teacherId = teacherId, + subjectId = subjectId, + addedDate = addedDate + ).apply { + valueMax = category?.valueTo ?: 0f + } + + data.gradeList.add(gradeObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_GRADE, + id, + profile.empty, + profile.empty + )) + } + + data.toRemove.add(DataRemoveModel.Grades.semesterWithType(profile.currentSemester, TYPE_POINT_AVG)) + + data.setSyncNext(ENDPOINT_LIBRUS_API_POINT_GRADES, SYNC_ALWAYS) + onSuccess(ENDPOINT_LIBRUS_API_POINT_GRADES) + } + } ?: onSuccess(ENDPOINT_LIBRUS_API_POINT_GRADES) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPtMeetings.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPtMeetings.kt index a2a3789a..6c0a9dd7 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPtMeetings.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPtMeetings.kt @@ -8,20 +8,23 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_PT_MEETINGS import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time class LibrusApiPtMeetings(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiPtMeetings" } init { apiGet(TAG, "ParentTeacherConferences") { json -> - val ptMeetings = json.getJsonArray("ParentTeacherConferences").asJsonObjectList() + val ptMeetings = json.getJsonArray("ParentTeacherConferences")?.asJsonObjectList() ptMeetings?.forEach { meeting -> val id = meeting.getLong("Id") ?: return@forEach @@ -36,17 +39,16 @@ class LibrusApiPtMeetings(override val data: DataLibrus, } val eventObject = Event( - profileId, - id, - eventDate, - startTime, - topic, - -1, - Event.TYPE_PT_MEETING, - false, - teacherId, - -1, - data.teamClass?.id ?: -1 + profileId = profileId, + id = id, + date = eventDate, + time = startTime, + topic = topic, + color = null, + type = Event.TYPE_PT_MEETING, + teacherId = teacherId, + subjectId = -1, + teamId = data.teamClass?.id ?: -1 ) data.eventList.add(eventObject) @@ -56,13 +58,14 @@ class LibrusApiPtMeetings(override val data: DataLibrus, Metadata.TYPE_EVENT, id, profile?.empty ?: false, - profile?.empty ?: false, - System.currentTimeMillis() + profile?.empty ?: false )) } + data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_PT_MEETING)) + data.setSyncNext(ENDPOINT_LIBRUS_API_PT_MEETINGS, 12*HOUR) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_PT_MEETINGS) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPushConfig.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPushConfig.kt new file mode 100644 index 00000000..9073d03f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiPushConfig.kt @@ -0,0 +1,47 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-2-21. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api + +import pl.szczodrzynski.edziennik.JsonObject +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_PUSH_CONFIG +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.getInt +import pl.szczodrzynski.edziennik.getJsonObject + +class LibrusApiPushConfig(override val data: DataLibrus, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { + companion object { + const val TAG = "LibrusApiPushConfig" + } + + init { data.app.config.sync.tokenLibrus?.also { tokenLibrus -> + if(tokenLibrus.isEmpty()) { + data.setSyncNext(ENDPOINT_LIBRUS_API_PUSH_CONFIG, SYNC_ALWAYS) + data.app.config.sync.tokenLibrusList = + data.app.config.sync.tokenLibrusList + profileId + onSuccess(ENDPOINT_LIBRUS_API_PUSH_CONFIG) + return@also + } + + apiGet(TAG, "ChangeRegister", payload = JsonObject( + "provider" to "FCM", + "device" to tokenLibrus, + "sendPush" to "1", + "appVersion" to 4 + )) { json -> + json.getJsonObject("ChangeRegister")?.getInt("Id")?.let { data.pushDeviceId = it } + + // sync always: this endpoint has .shouldSync set + data.setSyncNext(ENDPOINT_LIBRUS_API_PUSH_CONFIG, SYNC_ALWAYS) + data.app.config.sync.tokenLibrusList = + data.app.config.sync.tokenLibrusList + profileId + onSuccess(ENDPOINT_LIBRUS_API_PUSH_CONFIG) + } + } ?: onSuccess(ENDPOINT_LIBRUS_API_PUSH_CONFIG) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSchools.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSchools.kt index aff6f569..d405f9bf 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSchools.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSchools.kt @@ -8,12 +8,14 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_SCHOOLS import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange +import pl.szczodrzynski.edziennik.data.db.entity.LessonRange import pl.szczodrzynski.edziennik.utils.models.Time import java.util.* class LibrusApiSchools(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiSchools" } @@ -26,12 +28,7 @@ class LibrusApiSchools(override val data: DataLibrus, // create the school's short name using first letters of each long name's word // append the town name and save to student data - var schoolNameShort = "" - schoolNameLong?.split(" ")?.forEach { - if (it.isBlank()) - return@forEach - schoolNameShort += it[0].toLowerCase() - } + val schoolNameShort = schoolNameLong?.firstLettersName val schoolTown = school?.getString("Town")?.toLowerCase(Locale.getDefault()) data.schoolName = schoolId.toString() + schoolNameShort + "_" + schoolTown @@ -53,7 +50,7 @@ class LibrusApiSchools(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_SCHOOLS, 4 * DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_SCHOOLS) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSubjects.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSubjects.kt index 4c383933..cfd9bd31 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSubjects.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiSubjects.kt @@ -8,17 +8,19 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_SUBJECTS import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject +import pl.szczodrzynski.edziennik.data.db.entity.Subject class LibrusApiSubjects(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiSubjects" } init { apiGet(TAG, "Subjects") { json -> - val subjects = json.getJsonArray("Subjects").asJsonObjectList() + val subjects = json.getJsonArray("Subjects")?.asJsonObjectList() subjects?.forEach { subject -> val id = subject.getLong("Id") ?: return@forEach @@ -31,7 +33,7 @@ class LibrusApiSubjects(override val data: DataLibrus, data.subjectList.put(1, Subject(profileId, 1, "Zachowanie", "zach")) data.setSyncNext(ENDPOINT_LIBRUS_API_SUBJECTS, 4*DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_SUBJECTS) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDayTypes.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDayTypes.kt index 88c8ce14..e09504bf 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDayTypes.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDayTypes.kt @@ -8,17 +8,19 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceType +import pl.szczodrzynski.edziennik.data.db.entity.TeacherAbsenceType class LibrusApiTeacherFreeDayTypes(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiTeacherFreeDayTypes" } init { apiGet(TAG, "TeacherFreeDays/Types") { json -> - val teacherAbsenceTypes = json.getJsonArray("Types").asJsonObjectList() + val teacherAbsenceTypes = json.getJsonArray("Types")?.asJsonObjectList() teacherAbsenceTypes?.forEach { teacherAbsenceType -> val id = teacherAbsenceType.getLong("Id") ?: return@forEach @@ -34,7 +36,7 @@ class LibrusApiTeacherFreeDayTypes(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES, 7 * DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt index 1069ffa3..973ada46 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt @@ -10,13 +10,15 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsence +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.TeacherAbsence import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time class LibrusApiTeacherFreeDays(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiTeacherFreeDays" } @@ -27,7 +29,7 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus, } apiGet(TAG, "TeacherFreeDays") { json -> - val teacherAbsences = json.getJsonArray("TeacherFreeDays").asJsonObjectList() + val teacherAbsences = json.getJsonArray("TeacherFreeDays")?.asJsonObjectList() teacherAbsences?.forEach { teacherAbsence -> val id = teacherAbsence.getLong("Id") ?: return@forEach @@ -41,15 +43,15 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus, val timeTo = teacherAbsence.getString("TimeTo")?.let { Time.fromH_m_s(it) } val teacherAbsenceObject = TeacherAbsence( - profileId, - id, - teacherId, - type, - name, - dateFrom, - dateTo, - timeFrom, - timeTo + profileId = profileId, + id = id, + type = type, + name = name, + dateFrom = dateFrom, + dateTo = dateTo, + timeFrom = timeFrom, + timeTo = timeTo, + teacherId = teacherId ) data.teacherAbsenceList.add(teacherAbsenceObject) @@ -57,14 +59,13 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus, profileId, Metadata.TYPE_TEACHER_ABSENCE, id, - profile?.empty ?: false, - profile?.empty ?: false, - System.currentTimeMillis() + true, + profile?.empty ?: false )) } data.setSyncNext(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS, 6*HOUR, DRAWER_ITEM_AGENDA) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTemplate.kt index 3b111f0c..9fd6afee 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTemplate.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTemplate.kt @@ -8,7 +8,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi class LibrusApiTemplate(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApi" } @@ -17,7 +19,7 @@ class LibrusApiTemplate(override val data: DataLibrus, /*apiGet(TAG, "") { json -> data.setSyncNext(ENDPOINT_LIBRUS_API_, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_) }*/ } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGradeCategories.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGradeCategories.kt new file mode 100644 index 00000000..45b6b069 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGradeCategories.kt @@ -0,0 +1,47 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-29 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api + +import android.graphics.Color +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory + +class LibrusApiTextGradeCategories(override val data: DataLibrus, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { + companion object { + const val TAG = "LibrusApiTextGradeCategories" + } + + init { + apiGet(TAG, "TextGrades/Categories") { json -> + json.getJsonArray("Categories")?.asJsonObjectList()?.forEach { category -> + val id = category.getLong("Id") ?: return@forEach + val name = category.getString("Name") ?: "" + val color = category.getJsonObject("Color")?.getInt("Id") + ?.let { data.getColor(it) } ?: Color.BLUE + + val gradeCategoryObject = GradeCategory( + profileId, + id, + -1f, + color, + name + ).apply { + type = GradeCategory.TYPE_TEXT + } + + data.gradeCategories.put(id, gradeCategoryObject) + } + + data.setSyncNext(ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES, 1 * DAY) + onSuccess(ENDPOINT_LIBRUS_API_TEXT_GRADE_CATEGORIES) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGrades.kt new file mode 100644 index 00000000..7b7c8c6f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTextGrades.kt @@ -0,0 +1,83 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-29 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.api + +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TEXT_GRADES +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_DESCRIPTIVE +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.utils.models.Date + +class LibrusApiTextGrades(override val data: DataLibrus, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { + companion object { + const val TAG = "LibrusApiTextGrades" + } + + init { data.profile?.also { profile -> + apiGet(TAG, "DescriptiveGrades") { json -> + + json.getJsonArray("Grades")?.asJsonObjectList()?.forEach { grade -> + val id = grade.getLong("Id") ?: return@forEach + val teacherId = grade.getJsonObject("AddedBy")?.getLong("Id") ?: return@forEach + val semester = grade.getInt("Semester") ?: return@forEach + val subjectId = grade.getJsonObject("Subject")?.getLong("Id") ?: return@forEach + + val map = grade.getString("Map") + val realValue = grade.getString("RealGradeValue") + + val name = map ?: realValue ?: return@forEach + val description = if (map != null && map != realValue) realValue ?: "" else "" + + val categoryId = grade.getJsonObject("Skill")?.getLong("Id") ?: return@forEach + + val category = data.gradeCategories.singleOrNull { + it.categoryId == categoryId && it.type == GradeCategory.TYPE_DESCRIPTIVE + } + + val addedDate = Date.fromIso(grade.getString("AddDate") ?: return@forEach) + + val gradeObject = Grade( + profileId = profileId, + id = id, + name = name, + type = TYPE_DESCRIPTIVE, + value = 0f, + weight = 0f, + color = category?.color ?: -1, + category = category?.text ?: "", + description = description, + comment = grade.getString("Phrase") /* whatever it is */, + semester = semester, + teacherId = teacherId, + subjectId = subjectId, + addedDate = addedDate + ) + + data.gradeList.add(gradeObject) + data.metadataList.add(Metadata( + profileId, + Metadata.TYPE_GRADE, + id, + profile.empty, + profile.empty + )) + } + + data.toRemove.add(DataRemoveModel.Grades.semesterWithType(profile.currentSemester, TYPE_DESCRIPTIVE)) + + data.setSyncNext(ENDPOINT_LIBRUS_API_TEXT_GRADES, SYNC_ALWAYS) + onSuccess(ENDPOINT_LIBRUS_API_TEXT_GRADES) + } + } ?: onSuccess(ENDPOINT_LIBRUS_API_TEXT_GRADES) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTimetables.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTimetables.kt index ce2af163..9a463a6b 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTimetables.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTimetables.kt @@ -11,16 +11,18 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_TIMETABLES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson +import pl.szczodrzynski.edziennik.data.db.entity.Lesson +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS import pl.szczodrzynski.edziennik.utils.Utils.d import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time import pl.szczodrzynski.edziennik.utils.models.Week class LibrusApiTimetables(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiTimetables" } @@ -60,7 +62,7 @@ class LibrusApiTimetables(override val data: DataLibrus, } if (day.isNullOrEmpty() || !lessonsFound) { - data.lessonNewList.add(Lesson(profileId, lessonDate.value.toLong()).apply { + data.lessonList.add(Lesson(profileId, lessonDate.value.toLong()).apply { type = Lesson.TYPE_NO_LESSONS date = lessonDate }) @@ -69,9 +71,11 @@ class LibrusApiTimetables(override val data: DataLibrus, d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate") + if (data.timetableNotPublic) data.timetableNotPublic = false + data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd)) data.setSyncNext(ENDPOINT_LIBRUS_API_TIMETABLES, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_TIMETABLES) } } @@ -194,10 +198,9 @@ class LibrusApiTimetables(override val data: DataLibrus, Metadata.TYPE_LESSON_CHANGE, lessonObject.id, seen, - seen, - System.currentTimeMillis() + seen )) } - data.lessonNewList.add(lessonObject) + data.lessonList.add(lessonObject) }} } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUnits.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUnits.kt index be4b0087..791283ed 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUnits.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUnits.kt @@ -10,7 +10,9 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi class LibrusApiUnits(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiUnits" } @@ -18,12 +20,12 @@ class LibrusApiUnits(override val data: DataLibrus, init { run { if (data.unitId == 0L) { data.setSyncNext(ENDPOINT_LIBRUS_API_UNITS, 12 * DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_UNITS) return@run } apiGet(TAG, "Units") { json -> - val units = json.getJsonArray("Units").asJsonObjectList() + val units = json.getJsonArray("Units")?.asJsonObjectList() units?.singleOrNull { it.getLong("Id") == data.unitId }?.also { unit -> val startPoints = unit.getJsonObject("BehaviourGradesSettings")?.getJsonObject("StartPoints") @@ -38,7 +40,7 @@ class LibrusApiUnits(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_UNITS, 7 * DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_UNITS) } }} } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUsers.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUsers.kt index 71c18864..0ac9a5ea 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUsers.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiUsers.kt @@ -8,28 +8,37 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_USERS import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher +import pl.szczodrzynski.edziennik.data.db.entity.Teacher class LibrusApiUsers(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiUsers" } init { apiGet(TAG, "Users") { json -> - val users = json.getJsonArray("Users").asJsonObjectList() + val users = json.getJsonArray("Users")?.asJsonObjectList() users?.forEach { user -> val id = user.getLong("Id") ?: return@forEach val firstName = user.getString("FirstName")?.fixName() ?: "" val lastName = user.getString("LastName")?.fixName() ?: "" - data.teacherList.put(id, Teacher(profileId, id, firstName, lastName)) + val teacher = Teacher(profileId, id, firstName, lastName) + + if (user.getBoolean("IsSchoolAdministrator") == true) + teacher.setTeacherType(Teacher.TYPE_SCHOOL_ADMIN) + if (user.getBoolean("IsPedagogue") == true) + teacher.setTeacherType(Teacher.TYPE_PEDAGOGUE) + + data.teacherList.put(id, teacher) } data.setSyncNext(ENDPOINT_LIBRUS_API_USERS, 4*DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_USERS) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiVirtualClasses.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiVirtualClasses.kt index e8249978..9937f808 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiVirtualClasses.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiVirtualClasses.kt @@ -8,17 +8,19 @@ import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team +import pl.szczodrzynski.edziennik.data.db.entity.Team class LibrusApiVirtualClasses(override val data: DataLibrus, - val onSuccess: () -> Unit) : LibrusApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusApi(data, lastSync) { companion object { const val TAG = "LibrusApiVirtualClasses" } init { apiGet(TAG, "VirtualClasses") { json -> - val virtualClasses = json.getJsonArray("VirtualClasses").asJsonObjectList() + val virtualClasses = json.getJsonArray("VirtualClasses")?.asJsonObjectList() virtualClasses?.forEach { virtualClass -> val id = virtualClass.getLong("Id") ?: return@forEach @@ -30,7 +32,7 @@ class LibrusApiVirtualClasses(override val data: DataLibrus, } data.setSyncNext(ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES, 4*DAY) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetAttachment.kt index ed447ea8..b54e704b 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetAttachment.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetAttachment.kt @@ -4,27 +4,20 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages -import kotlinx.coroutines.* -import org.greenrobot.eventbus.EventBus -import pl.szczodrzynski.edziennik.data.api.ERROR_FILE_DOWNLOAD -import pl.szczodrzynski.edziennik.data.api.EXCEPTION_LIBRUS_MESSAGES_REQUEST -import pl.szczodrzynski.edziennik.data.api.Regexes +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages -import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent -import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent.Companion.TYPE_FINISHED -import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent.Companion.TYPE_PROGRESS -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.get -import pl.szczodrzynski.edziennik.getString -import pl.szczodrzynski.edziennik.utils.Utils -import java.io.File +import pl.szczodrzynski.edziennik.data.db.entity.Message import kotlin.coroutines.CoroutineContext -class LibrusMessagesGetAttachment( - override val data: DataLibrus, val message: Message, val attachmentId: Long, - val attachmentName: String, val onSuccess: () -> Unit) : LibrusMessages(data), CoroutineScope { +class LibrusMessagesGetAttachment(override val data: DataLibrus, + val message: Message, + val attachmentId: Long, + val attachmentName: String, + val onSuccess: () -> Unit +) : LibrusMessages(data, null), CoroutineScope { companion object { const val TAG = "LibrusMessagesGetAttachment" } @@ -34,8 +27,6 @@ class LibrusMessagesGetAttachment( override val coroutineContext: CoroutineContext get() = job + Dispatchers.Default - private var getAttachmentCheckKeyTries = 0 - init { messagesGet(TAG, "GetFileDownloadLink", parameters = mapOf( "fileId" to attachmentId, @@ -43,81 +34,8 @@ class LibrusMessagesGetAttachment( "archive" to 0 )) { doc -> val downloadLink = doc.select("response GetFileDownloadLink downloadLink").text() - val keyMatcher = Regexes.LIBRUS_ATTACHMENT_KEY.find(downloadLink) - if (keyMatcher != null) { - getAttachmentCheckKeyTries = 0 - - val attachmentKey = keyMatcher[1] - getAttachmentCheckKey(attachmentKey) { - downloadAttachment(attachmentKey) - } - } else { - data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD) - .withApiResponse(doc.toString())) - } - } - } - - private fun getAttachmentCheckKey(attachmentKey: String, callback: () -> Unit) { - sandboxGet(TAG, "CSCheckKey", - parameters = mapOf("singleUseKey" to attachmentKey)) { json -> - - when (json.getString("status")) { - "not_downloaded_yet" -> { - if (getAttachmentCheckKeyTries++ > 5) { - data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD) - .withApiResponse(json)) - return@sandboxGet - } - launch { - delay(2000) - getAttachmentCheckKey(attachmentKey, callback) - } - } - - "ready" -> { - launch { callback() } - } - - else -> { - data.error(ApiError(TAG, EXCEPTION_LIBRUS_MESSAGES_REQUEST) - .withApiResponse(json)) - } - } - } - } - - private fun downloadAttachment(attachmentKey: String) { - val targetFile = File(Utils.getStorageDir(), attachmentName) - - sandboxGetFile(TAG, "CSDownload&singleUseKey=$attachmentKey", targetFile, { file -> - - val event = AttachmentGetEvent( - profileId, - message.id, - attachmentId, - TYPE_FINISHED, - file.absolutePath - ) - - val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.messageId}_${event.attachmentId}") - Utils.writeStringToFile(attachmentDataFile, event.fileName) - - EventBus.getDefault().post(event) - - onSuccess() - - }) { written, _ -> - val event = AttachmentGetEvent( - profileId, - message.id, - attachmentId, - TYPE_PROGRESS, - bytesWritten = written - ) - - EventBus.getDefault().post(event) + LibrusSandboxDownloadAttachment(data, downloadLink, message, attachmentId, attachmentName, onSuccess) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt index 373fab34..9f962bf9 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetList.kt @@ -11,18 +11,19 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_MESSAGES_RECEIVED import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_MESSAGES_SENT import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher +import pl.szczodrzynski.edziennik.data.db.entity.* +import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED +import pl.szczodrzynski.edziennik.fixName import pl.szczodrzynski.edziennik.singleOrNull import pl.szczodrzynski.edziennik.utils.Utils import pl.szczodrzynski.edziennik.utils.models.Date -class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int = TYPE_RECEIVED, - archived: Boolean = false, val onSuccess: () -> Unit) : LibrusMessages(data) { +class LibrusMessagesGetList(override val data: DataLibrus, + override val lastSync: Long?, + private val type: Int = TYPE_RECEIVED, + archived: Boolean = false, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusMessages(data, lastSync) { companion object { const val TAG = "LibrusMessagesGetList" } @@ -33,6 +34,10 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int Message.TYPE_SENT -> "Outbox/action/GetList" else -> null } + val endpointId = when (type) { + TYPE_RECEIVED -> ENDPOINT_LIBRUS_MESSAGES_RECEIVED + else -> ENDPOINT_LIBRUS_MESSAGES_SENT + } if (endpoint != null) { messagesGet(TAG, endpoint, parameters = mapOf( @@ -51,12 +56,12 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int val recipientFirstName = element.select(when (type) { TYPE_RECEIVED -> "senderFirstName" else -> "receiverFirstName" - }).text().trim() + }).text().fixName() val recipientLastName = element.select(when (type) { TYPE_RECEIVED -> "senderLastName" else -> "receiverLastName" - }).text().trim() + }).text().fixName() val recipientId = data.teacherList.singleOrNull { it.name == recipientFirstName && it.surname == recipientLastName @@ -73,7 +78,7 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int val senderId = when (type) { TYPE_RECEIVED -> recipientId - else -> -1 + else -> null } val receiverId = when (type) { @@ -87,13 +92,13 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int } val messageObject = Message( - profileId, - id, - subject, - null, - type, - senderId, - -1 + profileId = profileId, + id = id, + type = type, + subject = subject, + body = null, + senderId = senderId, + addedDate = sentDate ) val messageRecipientObject = MessageRecipient( @@ -104,15 +109,19 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int id ) - data.messageIgnoreList.add(messageObject) + element.select("isAnyFileAttached")?.text()?.let { + if (it == "1") + messageObject.hasAttachments = true + } + + data.messageList.add(messageObject) data.messageRecipientList.add(messageRecipientObject) - data.metadataList.add(Metadata( + data.setSeenMetadataList.add(Metadata( profileId, Metadata.TYPE_MESSAGE, id, notified, - notified, - sentDate + notified )) } @@ -120,11 +129,11 @@ class LibrusMessagesGetList(override val data: DataLibrus, private val type: Int TYPE_RECEIVED -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_RECEIVED, SYNC_ALWAYS) Message.TYPE_SENT -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_SENT, DAY, DRAWER_ITEM_MESSAGES) } - onSuccess() + onSuccess(endpointId) } } else { data.error(TAG, ERROR_NOT_IMPLEMENTED) - onSuccess() + onSuccess(endpointId) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt index 27c21be8..49ee0d52 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetMessage.kt @@ -9,21 +9,23 @@ import org.greenrobot.eventbus.EventBus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipientFull -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED +import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.full.MessageFull +import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull import pl.szczodrzynski.edziennik.fixName +import pl.szczodrzynski.edziennik.isNotNullNorEmpty +import pl.szczodrzynski.edziennik.notEmptyOrNull import pl.szczodrzynski.edziennik.singleOrNull import pl.szczodrzynski.edziennik.utils.models.Date import java.nio.charset.Charset -class LibrusMessagesGetMessage( - override val data: DataLibrus, - private val messageObject: MessageFull, - val onSuccess: () -> Unit -) : LibrusMessages(data) { +class LibrusMessagesGetMessage(override val data: DataLibrus, + private val messageObject: MessageFull, + val onSuccess: () -> Unit +) : LibrusMessages(data, null) { companion object { const val TAG = "LibrusMessagesGetMessage" } @@ -56,24 +58,57 @@ class LibrusMessagesGetMessage( when (messageObject.type) { TYPE_RECEIVED -> { - val senderLoginId = message.select("senderId").text() - data.teacherList.singleOrNull { it.id == messageObject.senderId }?.loginId = senderLoginId + val senderLoginId = message.select("senderId").text().notEmptyOrNull() + val senderGroupId = message.select("senderGroupId").text().toIntOrNull() + val userClass = message.select("userClass").text().notEmptyOrNull() + data.teacherList.singleOrNull { it.id == messageObject.senderId }?.apply { + loginId = senderLoginId + setTeacherType(when (senderGroupId) { + /* https://api.librus.pl/2.0/Messages/Role */ + 0, 1, 99 -> Teacher.TYPE_SUPER_ADMIN + 2 -> Teacher.TYPE_SCHOOL_ADMIN + 3 -> Teacher.TYPE_PRINCIPAL + 4 -> Teacher.TYPE_TEACHER + 5, 9 -> { + if (typeDescription == null) + typeDescription = userClass + Teacher.TYPE_PARENT + } + 7 -> Teacher.TYPE_SECRETARIAT + 8 -> { + if (typeDescription == null) + typeDescription = userClass + Teacher.TYPE_STUDENT + } + 10 -> Teacher.TYPE_PEDAGOGUE + 11 -> Teacher.TYPE_LIBRARIAN + 12 -> Teacher.TYPE_SPECIALIST + 21 -> { + typeDescription = "Jednostka Nadrzędna" + Teacher.TYPE_OTHER + } + 50 -> { + typeDescription = "Jednostka Samorządu Terytorialnego" + Teacher.TYPE_OTHER + } + else -> Teacher.TYPE_OTHER + }) + } val readDateText = message.select("readDate").text() - val readDate = when (readDateText.isNotEmpty()) { + val readDate = when (readDateText.isNotNullNorEmpty()) { true -> Date.fromIso(readDateText) else -> 0 } val messageRecipientObject = MessageRecipientFull( - profileId, - -1, - -1, - readDate, - messageObject.id + profileId = profileId, + id = -1, + messageId = messageObject.id, + readDate = readDate ) - messageRecipientObject.fullName = profile.accountNameLong ?: profile.studentNameLong + messageRecipientObject.fullName = profile.accountName ?: profile.studentNameLong ?: "" messageRecipientList.add(messageRecipientObject) } @@ -90,17 +125,16 @@ class LibrusMessagesGetMessage( teacher?.loginId = receiverLoginId val readDateText = message.select("readed").text() - val readDate = when (readDateText.isNotEmpty()) { + val readDate = when (readDateText.isNotNullNorEmpty()) { true -> Date.fromIso(readDateText) else -> 0 } val messageRecipientObject = MessageRecipientFull( - profileId, - receiverId, - -1, - readDate, - messageObject.id + profileId = profileId, + id = receiverId, + messageId = messageObject.id, + readDate = readDate ) messageRecipientObject.fullName = "$receiverFirstName $receiverLastName" @@ -111,19 +145,20 @@ class LibrusMessagesGetMessage( } if (!messageObject.seen) { - data.messageMetadataList.add(Metadata( + data.setSeenMetadataList.add(Metadata( messageObject.profileId, Metadata.TYPE_MESSAGE, messageObject.id, true, - true, - messageObject.addedDate + true )) } messageObject.recipients = messageRecipientList data.messageRecipientList.addAll(messageRecipientList) + data.messageList.add(messageObject) + data.messageListReplace = true EventBus.getDefault().postSticky(MessageGetEvent(messageObject)) onSuccess() diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetRecipientList.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetRecipientList.kt new file mode 100644 index 00000000..053258d8 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesGetRecipientList.kt @@ -0,0 +1,175 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-12-31. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages + +import androidx.core.util.set +import androidx.room.OnConflictStrategy +import com.google.gson.JsonArray +import com.google.gson.JsonObject +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages +import pl.szczodrzynski.edziennik.data.api.events.RecipientListGetEvent +import pl.szczodrzynski.edziennik.data.db.entity.Teacher + +class LibrusMessagesGetRecipientList(override val data: DataLibrus, + val onSuccess: () -> Unit +) : LibrusMessages(data, null) { + companion object { + private const val TAG = "LibrusMessagesGetRecipientList" + } + + private val listTypes = mutableListOf>() + + init { + messagesGet(TAG, "Receivers/action/GetTypes", parameters = mapOf( + "includeClass" to 1 + )) { doc -> + doc.select("response GetTypes data list ArrayItem")?.forEach { + val id = it.getElementsByTag("id")?.firstOrNull()?.ownText() ?: return@forEach + val name = it.getElementsByTag("name")?.firstOrNull()?.ownText() ?: return@forEach + listTypes += id to name + } + + getLists() + } + } + + private fun getLists() { + if (listTypes.isEmpty()) { + finish() + return + } + val type = listTypes.removeAt(0) + if (type.first == "contactsGroups") { + getLists() + return + } + messagesGetJson(TAG, "Receivers/action/GetListForType", parameters = mapOf( + "receiverType" to type.first + )) { json -> + val dataEl = json?.getJsonObject("response")?.getJsonObject("GetListForType")?.get("data") + if (dataEl is JsonObject) { + val listEl = dataEl.get("ArrayItem") + if (listEl is JsonArray) { + listEl.asJsonObjectList()?.forEach { item -> + processElement(item, type.first, type.second) + } + } + if (listEl is JsonObject) { + processElement(listEl, type.first, type.second) + } + } + + getLists() + } + } + + private fun processElement(element: JsonObject, typeId: String, typeName: String, listName: String? = null) { + val listEl = element.getJsonObject("list")?.get("ArrayItem") + if (listEl is JsonArray) { + listEl.asJsonObjectList()?.let { list -> + val label = element.getString("label") ?: "" + list.forEach { item -> + processElement(item, typeId, typeName, label) + } + return + } + } + if (listEl is JsonObject) { + val label = element.getString("label") ?: "" + processElement(listEl, typeId, typeName, label) + return + } + processRecipient(element, typeId, typeName, listName) + } + + private fun processRecipient(recipient: JsonObject, typeId: String, typeName: String, listName: String? = null) { + val id = recipient.getLong("id") ?: return + val label = recipient.getString("label") ?: return + + val fullNameLastFirst: String + val description: String? + if (typeId == "parentsCouncil" || typeId == "schoolParentsCouncil") { + val delimiterIndex = label.lastIndexOf(" - ") + if (delimiterIndex == -1) { + fullNameLastFirst = label.fixName() + description = null + } + else { + fullNameLastFirst = label.substring(0, delimiterIndex).fixName() + description = label.substring(delimiterIndex+3) + } + } + else { + fullNameLastFirst = label.fixName() + description = null + } + + var typeDescription: String? = null + val type = when (typeId) { + "tutors" -> Teacher.TYPE_EDUCATOR + "teachers" -> Teacher.TYPE_TEACHER + "classParents" -> Teacher.TYPE_PARENT + "guardians" -> Teacher.TYPE_PARENT + "parentsCouncil" -> { + typeDescription = joinNotNullStrings(": ", listName, description) + Teacher.TYPE_PARENTS_COUNCIL + } + "schoolParentsCouncil" -> { + typeDescription = joinNotNullStrings(": ", listName, description) + Teacher.TYPE_SCHOOL_PARENTS_COUNCIL + } + "pedagogue" -> Teacher.TYPE_PEDAGOGUE + "librarian" -> Teacher.TYPE_LIBRARIAN + "admin" -> Teacher.TYPE_SCHOOL_ADMIN + "secretary" -> Teacher.TYPE_SECRETARIAT + "sadmin" -> Teacher.TYPE_SUPER_ADMIN + else -> { + typeDescription = typeName + Teacher.TYPE_OTHER + } + } + + // get teacher by fullName AND type or create it + val teacher = data.teacherList.singleOrNull { + it.fullNameLastFirst == fullNameLastFirst && ((type != Teacher.TYPE_SCHOOL_ADMIN && type != Teacher.TYPE_PEDAGOGUE) || it.isType(type)) + } ?: Teacher(data.profileId, id).apply { + if (typeId == "sadmin" && id == 2L) { + name = "Pomoc" + surname = "Techniczna LIBRUS" + } + else { + name = fullNameLastFirst + fullNameLastFirst.splitName()?.let { + name = it.second + surname = it.first + } + } + data.teacherList[id] = this + } + + teacher.apply { + this.loginId = id.toString() + this.setTeacherType(type) + if (this.typeDescription.isNullOrBlank()) + this.typeDescription = typeDescription + } + } + + private fun finish() { + val event = RecipientListGetEvent( + data.profileId, + data.teacherList.filter { it.loginId != null } + ) + + profile?.lastReceiversSync = System.currentTimeMillis() + + data.teacherOnConflictStrategy = OnConflictStrategy.REPLACE + EventBus.getDefault().postSticky(event) + onSuccess() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesSendMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesSendMessage.kt new file mode 100644 index 00000000..d568135e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesSendMessage.kt @@ -0,0 +1,60 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-2. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages + +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.base64Encode +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages +import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent +import pl.szczodrzynski.edziennik.data.db.entity.Message +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.getJsonObject +import pl.szczodrzynski.edziennik.getLong +import pl.szczodrzynski.edziennik.getString + +class LibrusMessagesSendMessage(override val data: DataLibrus, + val recipients: List, + val subject: String, + val text: String, + val onSuccess: () -> Unit +) : LibrusMessages(data, null) { + companion object { + const val TAG = "LibrusMessages" + } + + init { + val params = mapOf( + "topic" to subject.base64Encode(), + "message" to text.base64Encode(), + "receivers" to recipients + .filter { it.loginId != null } + .joinToString(",") { it.loginId ?: "" }, + "actions" to "".base64Encode() + ) + + messagesGetJson(TAG, "SendMessage", parameters = params) { json -> + + val response = json.getJsonObject("response").getJsonObject("SendMessage") + val id = response.getLong("data") + + if (response.getString("status") != "ok" || id == null) { + val message = response.getString("message") + // TODO error + return@messagesGetJson + } + + LibrusMessagesGetList(data, type = Message.TYPE_SENT, lastSync = null) { + val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.id == id } + val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == message?.id } + val event = MessageSentEvent(data.profileId, message, message?.addedDate) + + EventBus.getDefault().postSticky(event) + onSuccess() + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesTemplate.kt index 797bb2ca..6115e136 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesTemplate.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusMessagesTemplate.kt @@ -7,7 +7,9 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages -class LibrusMessagesTemplate(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusMessages(data) { +class LibrusMessagesTemplate(override val data: DataLibrus, + val onSuccess: () -> Unit +) : LibrusMessages(data, null) { companion object { const val TAG = "LibrusMessages" } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusSandboxDownloadAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusSandboxDownloadAttachment.kt new file mode 100644 index 00000000..567071aa --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/messages/LibrusSandboxDownloadAttachment.kt @@ -0,0 +1,117 @@ +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages + +import kotlinx.coroutines.* +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusMessages +import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.utils.Utils +import java.io.File +import kotlin.coroutines.CoroutineContext + +class LibrusSandboxDownloadAttachment(override val data: DataLibrus, + downloadLink: String, + val owner: Any, + val attachmentId: Long, + val attachmentName: String, + val onSuccess: () -> Unit +) : LibrusMessages(data, null), CoroutineScope { + companion object { + const val TAG = "LibrusSandboxDownloadAttachment" + } + + private var job = Job() + + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Default + + private var getAttachmentCheckKeyTries = 0 + + init { + val keyMatcher = Regexes.LIBRUS_ATTACHMENT_KEY.find(downloadLink) + + when { + downloadLink.contains("CSDownloadFailed") -> { + data.error(ApiError(TAG, ERROR_LIBRUS_MESSAGES_ATTACHMENT_NOT_FOUND)) + onSuccess() + } + keyMatcher != null -> { + getAttachmentCheckKeyTries = 0 + + val attachmentKey = keyMatcher[1] + getAttachmentCheckKey(attachmentKey) { + downloadAttachment("${LIBRUS_SANDBOX_URL}CSDownload&singleUseKey=$attachmentKey", method = POST) + } + } + else -> { + downloadAttachment("$downloadLink/get", method = GET) + } + } + } + + private fun getAttachmentCheckKey(attachmentKey: String, callback: () -> Unit) { + sandboxGet(TAG, "CSCheckKey", + parameters = mapOf("singleUseKey" to attachmentKey)) { json -> + + when (json.getString("status")) { + "not_downloaded_yet" -> { + if (getAttachmentCheckKeyTries++ > 5) { + data.error(ApiError(TAG, ERROR_FILE_DOWNLOAD) + .withApiResponse(json)) + return@sandboxGet + } + launch { + delay(2000) + getAttachmentCheckKey(attachmentKey, callback) + } + } + + "ready" -> { + launch { callback() } + } + + else -> { + data.error(ApiError(TAG, EXCEPTION_LIBRUS_MESSAGES_REQUEST) + .withApiResponse(json)) + } + } + } + } + + private fun downloadAttachment(url: String, method: Int = GET) { + val targetFile = File(Utils.getStorageDir(), attachmentName) + + sandboxGetFile(TAG, url, targetFile, { file -> + + val event = AttachmentGetEvent( + profileId, + owner, + attachmentId, + AttachmentGetEvent.TYPE_FINISHED, + file.absolutePath + ) + + val attachmentDataFile = File(Utils.getStorageDir(), ".${profileId}_${event.ownerId}_${event.attachmentId}") + Utils.writeStringToFile(attachmentDataFile, event.fileName) + + EventBus.getDefault().postSticky(event) + + onSuccess() + + }) { written, _ -> + val event = AttachmentGetEvent( + profileId, + owner, + attachmentId, + AttachmentGetEvent.TYPE_PROGRESS, + bytesWritten = written + ) + + EventBus.getDefault().postSticky(event) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetAttachment.kt new file mode 100644 index 00000000..6b1f2eba --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetAttachment.kt @@ -0,0 +1,24 @@ +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia + +import pl.szczodrzynski.edziennik.data.api.LIBRUS_SYNERGIA_MESSAGES_ATTACHMENT_URL +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusSandboxDownloadAttachment +import pl.szczodrzynski.edziennik.data.db.entity.Message + +class LibrusSynergiaGetAttachment(override val data: DataLibrus, + val message: Message, + val attachmentId: Long, + val attachmentName: String, + val onSuccess: () -> Unit +) : LibrusSynergia(data, null) { + companion object { + const val TAG = "LibrusSynergiaGetAttachment" + } + + init { + redirectUrlGet(TAG, "$LIBRUS_SYNERGIA_MESSAGES_ATTACHMENT_URL/${message.id}/$attachmentId") { url -> + LibrusSandboxDownloadAttachment(data, url, message, attachmentId, attachmentName, onSuccess) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetHomework.kt new file mode 100644 index 00000000..379bd42d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetHomework.kt @@ -0,0 +1,48 @@ +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia + +import android.text.Html +import org.greenrobot.eventbus.EventBus +import org.jsoup.Jsoup +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia +import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent +import pl.szczodrzynski.edziennik.data.db.full.EventFull + +class LibrusSynergiaGetHomework(override val data: DataLibrus, + val event: EventFull, + val onSuccess: () -> Unit +) : LibrusSynergia(data, null) { + companion object { + const val TAG = "LibrusSynergiaGetHomework" + } + + init { + synergiaGet(TAG, "moje_zadania/podglad/${event.id}") { text -> + val doc = Jsoup.parse(text) + + val table = doc.select("table.decorated tbody > tr") + + event.topic = table[1].select("td")[1].text() + event.homeworkBody = Html.fromHtml(table[5].select("td")[1].html()).toString() + + event.attachmentIds = mutableListOf() + event.attachmentNames = mutableListOf() + + if (table.size > 6) { + table[6].select("a").forEach { a -> + val attachmentId = a.attr("href").split('/') + .last().toLongOrNull() ?: return@forEach + val filename = a.text() + event.attachmentIds?.add(attachmentId) + event.attachmentNames?.add(filename) + } + } + + data.eventList.add(event) + data.eventListReplace = true + + EventBus.getDefault().postSticky(EventGetEvent(event)) + onSuccess() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetMessage.kt new file mode 100644 index 00000000..4cb1e246 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetMessage.kt @@ -0,0 +1,160 @@ +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia + +import org.greenrobot.eventbus.EventBus +import org.jsoup.Jsoup +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia +import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent +import pl.szczodrzynski.edziennik.data.db.entity.Message +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.full.MessageFull +import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.isNotNullNorEmpty +import pl.szczodrzynski.edziennik.singleOrNull +import pl.szczodrzynski.edziennik.swapFirstLastName +import pl.szczodrzynski.edziennik.utils.models.Date + +class LibrusSynergiaGetMessage(override val data: DataLibrus, + private val messageObject: MessageFull, + val onSuccess: () -> Unit) : LibrusSynergia(data, null) { + companion object { + const val TAG = "LibrusSynergiaGetMessage" + } + + init { + val endpoint = when (messageObject.type) { + Message.TYPE_SENT -> "wiadomosci/1/6/${messageObject.id}/f0" + else -> "wiadomosci/1/5/${messageObject.id}/f0" + } + + data.profile?.also { profile -> + synergiaGet(TAG, endpoint) { text -> + val doc = Jsoup.parse(text) + + val messageElement = doc.select(".container-message tr")[0].child(1) + val detailsElement = messageElement.child(1) + val readElement = messageElement.children().last() + + val body = messageElement.select(".container-message-content").html() + + messageObject.apply { + this.body = body + + clearAttachments() + if (messageElement.children().size >= 5) { + messageElement.child(3).select("tr").forEachIndexed { i, attachment -> + if (i == 0) return@forEachIndexed // Skip the header + val filename = attachment.child(0).text().trim() + val attachmentId = "wiadomosci\\\\/pobierz_zalacznik\\\\/[0-9]+?\\\\/([0-9]+)\"".toRegex() + .find(attachment.select("img").attr("onclick"))?.get(1) + ?: return@forEachIndexed + addAttachment(attachmentId.toLong(), filename, -1) + } + } + } + + val messageRecipientList = mutableListOf() + + when (messageObject.type) { + Message.TYPE_RECEIVED -> { + val senderFullName = detailsElement.child(0).select(".left").text() + val senderGroupName = "\\[(.+?)]".toRegex().find(senderFullName)?.get(1)?.trim() + + data.teacherList.singleOrNull { it.id == messageObject.senderId }?.apply { + setTeacherType(when (senderGroupName) { + /* https://api.librus.pl/2.0/Messages/Role */ + "Pomoc techniczna Librus", "SuperAdministrator" -> Teacher.TYPE_SUPER_ADMIN + "Administrator szkoły" -> Teacher.TYPE_SCHOOL_ADMIN + "Dyrektor Szkoły" -> Teacher.TYPE_PRINCIPAL + "Nauczyciel" -> Teacher.TYPE_TEACHER + "Rodzic", "Opiekun" -> Teacher.TYPE_PARENT + "Sekretariat" -> Teacher.TYPE_SECRETARIAT + "Uczeń" -> Teacher.TYPE_STUDENT + "Pedagog/Psycholog szkolny" -> Teacher.TYPE_PEDAGOGUE + "Pracownik biblioteki" -> Teacher.TYPE_LIBRARIAN + "Inny specjalista" -> Teacher.TYPE_SPECIALIST + "Jednostka Nadrzędna" -> { + typeDescription = "Jednostka Nadrzędna" + Teacher.TYPE_OTHER + } + "Jednostka Samorządu Terytorialnego" -> { + typeDescription = "Jednostka Samorządu Terytorialnego" + Teacher.TYPE_OTHER + } + else -> Teacher.TYPE_OTHER + }) + } + + val readDateText = readElement.select(".left").text() + val readDate = when (readDateText.isNotNullNorEmpty()) { + true -> Date.fromIso(readDateText) + else -> 0 + } + + val messageRecipientObject = MessageRecipientFull( + profileId = profileId, + id = -1, + messageId = messageObject.id, + readDate = readDate + ) + + messageRecipientObject.fullName = profile.accountName + ?: profile.studentNameLong + + messageRecipientList.add(messageRecipientObject) + } + + Message.TYPE_SENT -> { + + readElement.select("tr").forEachIndexed { i, receiver -> + if (i == 0) return@forEachIndexed // Skip the header + + val receiverFullName = receiver.child(0).text() + val receiverName = receiverFullName.split('(')[0].swapFirstLastName() + + val teacher = data.teacherList.singleOrNull { it.fullName == receiverName } + val receiverId = teacher?.id ?: -1 + + val readDate = when (val readDateText = receiver.child(1).text().trim()) { + "NIE" -> 0 + else -> Date.fromIso(readDateText) + } + + val messageRecipientObject = MessageRecipientFull( + profileId = profileId, + id = receiverId, + messageId = messageObject.id, + readDate = readDate + ) + + messageRecipientObject.fullName = receiverName + + messageRecipientList.add(messageRecipientObject) + } + } + } + + if (!messageObject.seen) { + data.setSeenMetadataList.add(Metadata( + messageObject.profileId, + Metadata.TYPE_MESSAGE, + messageObject.id, + true, + true + )) + } + + messageObject.recipients = messageRecipientList + data.messageRecipientList.addAll(messageRecipientList) + + data.messageList.add(messageObject) + data.messageListReplace = true + + EventBus.getDefault().postSticky(MessageGetEvent(messageObject)) + onSuccess() + } + } ?: onSuccess() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetMessages.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetMessages.kt new file mode 100644 index 00000000..ffc8133a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaGetMessages.kt @@ -0,0 +1,116 @@ +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia + +import org.jsoup.Jsoup +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.ERROR_NOT_IMPLEMENTED +import pl.szczodrzynski.edziennik.data.api.Regexes +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.* +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia +import pl.szczodrzynski.edziennik.data.db.entity.* +import pl.szczodrzynski.edziennik.utils.Utils +import pl.szczodrzynski.edziennik.utils.models.Date + +class LibrusSynergiaGetMessages(override val data: DataLibrus, + override val lastSync: Long?, + private val type: Int = Message.TYPE_RECEIVED, + archived: Boolean = false, + val onSuccess: (Int) -> Unit) : LibrusSynergia(data, lastSync) { + companion object { + const val TAG = "LibrusSynergiaGetMessages" + } + + init { + val endpoint = when (type) { + Message.TYPE_RECEIVED -> "wiadomosci/5" + Message.TYPE_SENT -> "wiadomosci/6" + else -> null + } + val endpointId = when (type) { + Message.TYPE_RECEIVED -> ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_RECEIVED + else -> ENDPOINT_LIBRUS_SYNERGIA_MESSAGES_SENT + } + + if (endpoint != null) { + synergiaGet(TAG, endpoint) { text -> + val doc = Jsoup.parse(text) + + fun getRecipientId(name: String): Long = data.teacherList.singleOrNull { + it.fullNameLastFirst == name + }?.id ?: { + val teacherObject = Teacher( + profileId, + -1 * Utils.crc16(name.swapFirstLastName().toByteArray()).toLong(), + name.splitName()?.second!!, + name.splitName()?.first!! + ) + data.teacherList.put(teacherObject.id, teacherObject) + teacherObject.id + }.invoke() + + doc.select(".decorated.stretch tbody > tr").forEach { messageElement -> + val url = messageElement.select("a").first().attr("href") + val id = Regexes.LIBRUS_MESSAGE_ID.find(url)?.get(1)?.toLong() ?: return@forEach + val subject = messageElement.child(3).text() + val sentDate = Date.fromIso(messageElement.child(4).text()) + val recipientName = messageElement.child(2).text().split('(')[0].fixName() + val recipientId = getRecipientId(recipientName) + val read = messageElement.child(2).attr("style").isNullOrBlank() + + val senderId = when (type) { + Message.TYPE_RECEIVED -> recipientId + else -> null + } + + val receiverId = when (type) { + Message.TYPE_RECEIVED -> -1 + else -> recipientId + } + + val notified = when (type) { + Message.TYPE_SENT -> true + else -> read || profile?.empty ?: false + } + + val messageObject = Message( + profileId = profileId, + id = id, + type = type, + subject = subject, + body = null, + senderId = senderId, + addedDate = sentDate + ) + + val messageRecipientObject = MessageRecipient( + profileId, + receiverId, + -1, + if (read) 1 else 0, + id + ) + + messageObject.hasAttachments = !messageElement.child(1).select("img").isEmpty() + + data.messageList.add(messageObject) + data.messageRecipientList.add(messageRecipientObject) + data.setSeenMetadataList.add(Metadata( + profileId, + Metadata.TYPE_MESSAGE, + id, + notified, + notified + )) + } + + when (type) { + Message.TYPE_RECEIVED -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_RECEIVED, SYNC_ALWAYS) + Message.TYPE_SENT -> data.setSyncNext(ENDPOINT_LIBRUS_MESSAGES_SENT, DAY, MainActivity.DRAWER_ITEM_MESSAGES) + } + onSuccess(endpointId) + } + } else { + data.error(TAG, ERROR_NOT_IMPLEMENTED) + onSuccess(endpointId) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt index a34ee1e9..d33f6911 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomework.kt @@ -12,25 +12,28 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata import pl.szczodrzynski.edziennik.get import pl.szczodrzynski.edziennik.singleOrNull import pl.szczodrzynski.edziennik.utils.models.Date -class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) { +class LibrusSynergiaHomework(override val data: DataLibrus, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusSynergia(data, lastSync) { companion object { const val TAG = "LibrusSynergiaHomework" } - init { + init { data.profile?.also { profile -> synergiaGet(TAG, "moje_zadania", method = POST, parameters = mapOf( "dataOd" to - if (data.profile?.empty != false) - profile!!.getSemesterStart(1).stringY_m_d + if (profile.empty) + profile.getSemesterStart(1).stringY_m_d else Date.getToday().stringY_m_d, - "dataDo" to profile!!.getSemesterEnd(profile?.currentSemester ?: 2).stringY_m_d, + "dataDo" to Date.getToday().stepForward(0, 0, 7).stringY_m_d, "przedmiot" to -1 )) { text -> @@ -39,8 +42,6 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () -> doc.select("table.myHomeworkTable > tbody").firstOrNull()?.also { homeworkTable -> val homeworkElements = homeworkTable.children() - val graphElements = doc.select("table[border].center td[align=left] tbody").first().children() - homeworkElements.forEachIndexed { i, el -> val elements = el.children() @@ -51,37 +52,32 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () -> val teacherId = data.teacherList.singleOrNull { teacherName == it.fullName }?.id ?: -1 val topic = elements[2].text().trim() - val addedDate = Date.fromY_m_d(elements[4].text().trim()).inMillis + val addedDate = Date.fromY_m_d(elements[4].text().trim()) val eventDate = Date.fromY_m_d(elements[6].text().trim()) val id = "/podglad/([0-9]+)'".toRegex().find( elements[9].select("input").attr("onclick") )?.get(1)?.toLong() ?: return@forEachIndexed - val lessons = data.db.timetableDao().getForDateNow(profileId, eventDate) + val lessons = data.db.timetableDao().getAllForDateNow(profileId, eventDate) val startTime = lessons.firstOrNull { it.subjectId == subjectId }?.startTime - val moreInfo = graphElements[2 * i + 1].select("td[title]") - .attr("title").trim() - val description = "Treść: (.*)".toRegex(RegexOption.DOT_MATCHES_ALL).find(moreInfo) - ?.get(1)?.replace("".toRegex(), "\n")?.trim() - - val seen = when (profile?.empty) { + val seen = when (profile.empty) { true -> true else -> eventDate < Date.getToday() } val eventObject = Event( - profileId, - id, - eventDate, - startTime, - "$topic\n$description", - -1, - Event.TYPE_HOMEWORK, - false, - teacherId, - subjectId, - data.teamClass?.id ?: -1 + profileId = profileId, + id = id, + date = eventDate, + time = startTime, + topic = topic, + color = null, + type = Event.TYPE_HOMEWORK, + teacherId = teacherId, + subjectId = subjectId, + teamId = data.teamClass?.id ?: -1, + addedDate = addedDate.inMillis ) data.eventList.add(eventObject) @@ -90,17 +86,16 @@ class LibrusSynergiaHomework(override val data: DataLibrus, val onSuccess: () -> Metadata.TYPE_HOMEWORK, id, seen, - seen, - addedDate + seen )) } } data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK)) - // because this requires a synergia login (2 more requests) sync this every two hours or if explicit :D - data.setSyncNext(ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK, 2 * HOUR, DRAWER_ITEM_HOMEWORK) - onSuccess() + // because this requires a synergia login (2 more requests!!!) sync this every few hours or if explicit :D + data.setSyncNext(ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK, 5 * HOUR, DRAWER_ITEM_HOMEWORK) + onSuccess(ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK) } - } + } ?: onSuccess(ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomeworkGetAttachment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomeworkGetAttachment.kt new file mode 100644 index 00000000..a6d4b94b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaHomeworkGetAttachment.kt @@ -0,0 +1,25 @@ +package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia + +import pl.szczodrzynski.edziennik.data.api.LIBRUS_SYNERGIA_HOMEWORK_ATTACHMENT_URL +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.messages.LibrusSandboxDownloadAttachment +import pl.szczodrzynski.edziennik.data.db.full.EventFull + +class LibrusSynergiaHomeworkGetAttachment( + override val data: DataLibrus, + val event: EventFull, + val attachmentId: Long, + val attachmentName: String, + val onSuccess: () -> Unit +) : LibrusSynergia(data, null) { + companion object { + const val TAG = "LibrusSynergiaHomeworkGetAttachment" + } + + init { + redirectUrlGet(TAG, "$LIBRUS_SYNERGIA_HOMEWORK_ATTACHMENT_URL/$attachmentId") { url -> + LibrusSandboxDownloadAttachment(data, url, event, attachmentId, attachmentName, onSuccess) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaInfo.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaInfo.kt index 3ccb230f..66e11785 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaInfo.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaInfo.kt @@ -10,7 +10,10 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.ENDPOINT_LIBRUS_SYNERGIA_INFO import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia -class LibrusSynergiaInfo(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) { +class LibrusSynergiaInfo(override val data: DataLibrus, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : LibrusSynergia(data, lastSync) { companion object { const val TAG = "LibrusSynergiaInfo" } @@ -28,7 +31,7 @@ class LibrusSynergiaInfo(override val data: DataLibrus, val onSuccess: () -> Uni } data.setSyncNext(ENDPOINT_LIBRUS_SYNERGIA_INFO, MONTH) - onSuccess() + onSuccess(ENDPOINT_LIBRUS_SYNERGIA_INFO) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaMarkAllAnnouncementsAsRead.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaMarkAllAnnouncementsAsRead.kt index 4a0ca241..04a7f5b6 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaMarkAllAnnouncementsAsRead.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaMarkAllAnnouncementsAsRead.kt @@ -6,14 +6,18 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia +import pl.szczodrzynski.edziennik.data.db.entity.Metadata -class LibrusSynergiaMarkAllAnnouncementsAsRead(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) { +class LibrusSynergiaMarkAllAnnouncementsAsRead(override val data: DataLibrus, + val onSuccess: () -> Unit +) : LibrusSynergia(data, null) { companion object { const val TAG = "LibrusSynergiaMarkAllAnnouncementsAsRead" } init { synergiaGet(TAG, "ogloszenia") { + data.app.db.metadataDao().setAllSeen(profileId, Metadata.TYPE_ANNOUNCEMENT, true) onSuccess() } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaTemplate.kt index af519128..ddfb4457 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaTemplate.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/synergia/LibrusSynergiaTemplate.kt @@ -7,7 +7,9 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.synergia import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusSynergia -class LibrusSynergiaTemplate(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusSynergia(data) { +class LibrusSynergiaTemplate(override val data: DataLibrus, + val onSuccess: () -> Unit +) : LibrusSynergia(data, null) { companion object { const val TAG = "LibrusSynergia" } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/firstlogin/LibrusFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/firstlogin/LibrusFirstLogin.kt index 1301222b..68f44269 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/firstlogin/LibrusFirstLogin.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/firstlogin/LibrusFirstLogin.kt @@ -2,10 +2,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.librus.firstlogin import org.greenrobot.eventbus.EventBus import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.ERROR_NO_STUDENTS_IN_ACCOUNT -import pl.szczodrzynski.edziennik.data.api.FAKE_LIBRUS_ACCOUNTS -import pl.szczodrzynski.edziennik.data.api.LIBRUS_ACCOUNTS_URL -import pl.szczodrzynski.edziennik.data.api.LOGIN_MODE_LIBRUS_EMAIL +import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusPortal @@ -13,9 +10,7 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginApi import pl.szczodrzynski.edziennik.data.api.edziennik.librus.login.LibrusLoginPortal import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.api.models.AppError.CODE_LIBRUS_DISCONNECTED -import pl.szczodrzynski.edziennik.data.api.models.AppError.CODE_SYNERGIA_NOT_ACTIVATED -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Profile class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) { companion object { @@ -23,10 +18,14 @@ class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) { } private val portal = LibrusPortal(data) - private val api = LibrusApi(data) + private val api = LibrusApi(data, null) private val profileList = mutableListOf() init { + val loginStoreId = data.loginStore.id + val loginStoreType = LOGIN_TYPE_LIBRUS + var firstProfileId = loginStoreId + if (data.loginStore.mode == LOGIN_MODE_LIBRUS_EMAIL) { // email login: use Portal for account list LibrusLoginPortal(data) { @@ -34,9 +33,8 @@ class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) { val accounts = json.getJsonArray("accounts") if (accounts == null || accounts.size() < 1) { - data.error(ApiError(TAG, ERROR_NO_STUDENTS_IN_ACCOUNT) - .withResponse(response) - .withApiResponse(json)) + EventBus.getDefault().postSticky(FirstLoginFinishedEvent(listOf(), data.loginStore)) + onSuccess() return@portalGet } val accountDataTime = json.getLong("lastModification") @@ -46,8 +44,8 @@ class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) { val state = account.getString("state") when (state) { - "requiring_an_action" -> CODE_LIBRUS_DISCONNECTED - "need-activation" -> CODE_SYNERGIA_NOT_ACTIVATED + "requiring_an_action" -> ERROR_LIBRUS_PORTAL_SYNERGIA_DISCONNECTED + "need-activation" -> ERROR_LOGIN_LIBRUS_PORTAL_NOT_ACTIVATED else -> null }?.let { errorCode -> data.error(ApiError(TAG, errorCode) @@ -56,26 +54,34 @@ class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) { return@portalGet } + val isParent = account.getString("group") == "parent" + val id = account.getInt("id") ?: continue val login = account.getString("login") ?: continue val token = account.getString("accessToken") ?: continue val tokenTime = (accountDataTime ?: 0) + DAY - val name = account.getString("studentName")?.fixName() ?: "" + val studentNameLong = account.getString("studentName").fixName() + val studentNameShort = studentNameLong.getShortName() - val profile = Profile() - profile.studentNameLong = name - profile.studentNameShort = name.getShortName() - profile.name = profile.studentNameLong - profile.subname = data.portalEmail - profile.empty = true - profile.putStudentData("accountId", id) - profile.putStudentData("accountLogin", login) - profile.putStudentData("accountToken", token) - profile.putStudentData("accountTokenTime", tokenTime) + val profile = Profile( + firstProfileId++, + loginStoreId, + loginStoreType, + studentNameLong, + data.portalEmail, + studentNameLong, + studentNameShort, + if (isParent) studentNameLong else null /* temporarily - there is no parent name provided, only the type */ + ).apply { + studentData["accountId"] = id + studentData["accountLogin"] = login + studentData["accountToken"] = token + studentData["accountTokenTime"] = tokenTime + } profileList.add(profile) } - EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore)) + EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore)) onSuccess() } } @@ -85,35 +91,40 @@ class LibrusFirstLogin(val data: DataLibrus, val onSuccess: () -> Unit) { LibrusLoginApi(data) { api.apiGet(TAG, "Me") { json -> - val profile = Profile() - val me = json.getJsonObject("Me") val account = me?.getJsonObject("Account") val user = me?.getJsonObject("User") - profile.putStudentData("isPremium", account?.getBoolean("IsPremium") == true || account?.getBoolean("IsPremiumDemo") == true) + val login = account.getString("Login") + val isParent = account?.getInt("GroupId") in 5..6 - val isParent = account?.getInt("GroupId") == 5 - profile.accountNameLong = - if (isParent) - buildFullName(account?.getString("FirstName"), account?.getString("LastName")) - else null + val studentNameLong = buildFullName(user?.getString("FirstName"), user?.getString("LastName")) + val studentNameShort = studentNameLong.getShortName() + val accountNameLong = if (isParent) + buildFullName(account?.getString("FirstName"), account?.getString("LastName")) + else null - profile.studentNameLong = - buildFullName(user?.getString("FirstName"), user?.getString("LastName")) - - profile.studentNameShort = profile.studentNameLong?.getShortName() - profile.name = profile.studentNameLong - profile.subname = account.getString("Login") - profile.empty = true - profile.putStudentData("accountId", account.getInt("Id") ?: 0) - profile.putStudentData("accountLogin", profile.subname) - profile.putStudentData("accountToken", data.apiAccessToken) - profile.putStudentData("accountRefreshToken", data.apiRefreshToken) - profile.putStudentData("accountTokenTime", data.apiTokenExpiryTime) + val profile = Profile( + firstProfileId++, + loginStoreId, + loginStoreType, + studentNameLong, + login, + studentNameLong, + studentNameShort, + accountNameLong + ).apply { + studentData["isPremium"] = account?.getBoolean("IsPremium") == true || account?.getBoolean("IsPremiumDemo") == true + studentData["accountId"] = account.getInt("Id") ?: 0 + studentData["accountLogin"] = data.apiLogin ?: login + studentData["accountPassword"] = data.apiPassword + studentData["accountToken"] = data.apiAccessToken + studentData["accountTokenTime"] = data.apiTokenExpiryTime + studentData["accountRefreshToken"] = data.apiRefreshToken + } profileList.add(profile) - EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore)) + EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore)) onSuccess() } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginApi.kt index 0f843a88..7151cf29 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginApi.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginApi.kt @@ -18,6 +18,7 @@ import pl.szczodrzynski.edziennik.getUnixDate import pl.szczodrzynski.edziennik.utils.Utils.d import java.net.HttpURLConnection.* +@Suppress("ConvertSecondaryConstructorToPrimary") class LibrusLoginApi { companion object { private const val TAG = "LoginLibrusApi" @@ -137,6 +138,7 @@ class LibrusLoginApi { "librus_change_password_error" -> ERROR_LOGIN_LIBRUS_API_CHANGE_PASSWORD_ERROR "librus_password_change_required" -> ERROR_LOGIN_LIBRUS_API_PASSWORD_CHANGE_REQUIRED "invalid_grant" -> ERROR_LOGIN_LIBRUS_API_INVALID_LOGIN + "invalid_request" -> ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST else -> ERROR_LOGIN_LIBRUS_API_OTHER }.let { errorCode -> data.error(ApiError(TAG, errorCode) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginMessages.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginMessages.kt index 9767683b..9bfad99f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginMessages.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginMessages.kt @@ -8,9 +8,9 @@ import im.wangchao.mhttp.Request import im.wangchao.mhttp.Response import im.wangchao.mhttp.body.MediaTypeUtils import im.wangchao.mhttp.callback.TextCallbackHandler -import okhttp3.Cookie import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.LibrusRecaptchaHelper import pl.szczodrzynski.edziennik.data.api.models.ApiError import pl.szczodrzynski.edziennik.getUnixDate import pl.szczodrzynski.edziennik.utils.Utils.d @@ -36,17 +36,39 @@ class LibrusLoginMessages(val data: DataLibrus, val onSuccess: () -> Unit) { onSuccess() } + text?.contains("grecaptcha.ready") == true -> { + val url = response?.request()?.url()?.toString() ?: run { + //data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text) + data.messagesLoginSuccessful = false + onSuccess() + return + } + + LibrusRecaptchaHelper(data.app, url, text, onSuccess = { newUrl -> + loginWithSynergia(newUrl) + }, onTimeout = { + //data.error(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_TIMEOUT, response, text) + data.messagesLoginSuccessful = false + onSuccess() + }) + } + text?.contains("ok") == true -> { saveSessionId(response, text) onSuccess() } text?.contains("Niepoprawny login i/lub hasło.") == true -> data.error(TAG, ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN, response, text) text?.contains("stop.png") == true -> data.error(TAG, ERROR_LIBRUS_SYNERGIA_ACCESS_DENIED, response, text) - text?.contains("eAccessDeny") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text) + text?.contains("eAccessDeny") == true -> { + // data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text) + data.messagesLoginSuccessful = false + onSuccess() + } text?.contains("OffLine") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_MAINTENANCE, response, text) text?.contains("error") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ERROR, response, text) text?.contains("eVarWhitThisNameNotExists") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_ACCESS_DENIED, response, text) text?.contains("") == true -> data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text) + else -> data.error(TAG, ERROR_LIBRUS_MESSAGES_OTHER, response, text) } } @@ -64,21 +86,15 @@ class LibrusLoginMessages(val data: DataLibrus, val onSuccess: () -> Unit) { } if (data.isMessagesLoginValid()) { - data.app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name("DZIENNIKSID") - .value(data.messagesSessionId!!) - .domain("wiadomosci.librus.pl") - .secure().httpOnly().build() - )) + data.app.cookieJar.set("wiadomosci.librus.pl", "DZIENNIKSID", data.messagesSessionId) onSuccess() } else { - data.app.cookieJar.clearForDomain("wiadomosci.librus.pl") + data.app.cookieJar.clear("wiadomosci.librus.pl") if (data.loginMethods.contains(LOGIN_METHOD_LIBRUS_SYNERGIA)) { loginWithSynergia() } - else if (data.apiLogin != null && data.apiPassword != null) { + else if (data.apiLogin != null && data.apiPassword != null && false) { loginWithCredentials() } else { @@ -148,7 +164,7 @@ class LibrusLoginMessages(val data: DataLibrus, val onSuccess: () -> Unit) { } private fun saveSessionId(response: Response?, text: String?) { - var sessionId = data.app.cookieJar.getCookie("wiadomosci.librus.pl", "DZIENNIKSID") + var sessionId = data.app.cookieJar.get("wiadomosci.librus.pl", "DZIENNIKSID") sessionId = sessionId?.replace("-MAINT", "") // dunno what's this sessionId = sessionId?.replace("MAINT", "") // dunno what's this if (sessionId == null) { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginPortal.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginPortal.kt index 41ad6255..f164e3ed 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginPortal.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginPortal.kt @@ -7,14 +7,12 @@ import im.wangchao.mhttp.Response import im.wangchao.mhttp.body.MediaTypeUtils import im.wangchao.mhttp.callback.JsonCallbackHandler import im.wangchao.mhttp.callback.TextCallbackHandler +import pl.szczodrzynski.edziennik.* import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.getInt -import pl.szczodrzynski.edziennik.getString -import pl.szczodrzynski.edziennik.getUnixDate import pl.szczodrzynski.edziennik.utils.Utils.d -import java.net.HttpURLConnection.HTTP_UNAUTHORIZED +import java.net.HttpURLConnection.* import java.util.* import java.util.regex.Pattern @@ -38,11 +36,21 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) { onSuccess() } else if (data.portalRefreshToken != null) { - data.app.cookieJar.clearForDomain("portal.librus.pl") + if (data.fakeLogin) { + data.app.cookieJar.clear("librus.szkolny.eu") + } + else { + data.app.cookieJar.clear("portal.librus.pl") + } accessToken(null, data.portalRefreshToken) } else { - data.app.cookieJar.clearForDomain("portal.librus.pl") + if (data.fakeLogin) { + data.app.cookieJar.clear("librus.szkolny.eu") + } + else { + data.app.cookieJar.clear("portal.librus.pl") + } authorize(if (data.fakeLogin) FAKE_LIBRUS_AUTHORIZE else LIBRUS_AUTHORIZE_URL) } }} @@ -55,23 +63,31 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) { .userAgent(LIBRUS_USER_AGENT) .withClient(data.app.httpLazy) .callback(object : TextCallbackHandler() { - override fun onSuccess(json: String, response: Response) { + override fun onSuccess(text: String, response: Response) { val location = response.headers().get("Location") if (location != null) { - val authMatcher = Pattern.compile("http://localhost/bar\\?code=([A-z0-9]+?)$", Pattern.DOTALL or Pattern.MULTILINE).matcher(location) - if (authMatcher.find()) { - accessToken(authMatcher.group(1), null) - } else { - authorize(location) + val authMatcher = Pattern.compile("$LIBRUS_REDIRECT_URL\\?code=([A-z0-9]+?)$", Pattern.DOTALL or Pattern.MULTILINE).matcher(location) + when { + authMatcher.find() -> { + accessToken(authMatcher.group(1), null) + } + location.contains("rejected_client") -> { + data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_PORTAL_INVALID_CLIENT_ID) + .withResponse(response) + .withApiResponse("Location: $location\n$text")) + } + else -> { + authorize(location) + } } } else { - val csrfMatcher = Pattern.compile("name=\"csrf-token\" content=\"([A-z0-9=+/\\-_]+?)\"", Pattern.DOTALL).matcher(json) + val csrfMatcher = Pattern.compile("name=\"csrf-token\" content=\"([A-z0-9=+/\\-_]+?)\"", Pattern.DOTALL).matcher(text) if (csrfMatcher.find()) { login(csrfMatcher.group(1)) } else { data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_PORTAL_CSRF_MISSING) .withResponse(response) - .withApiResponse(json)) + .withApiResponse(text)) } } } @@ -89,18 +105,29 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) { private fun login(csrfToken: String) { d(TAG, "Request: Librus/Login/Portal - ${if (data.fakeLogin) FAKE_LIBRUS_LOGIN else LIBRUS_LOGIN_URL}") + val recaptchaCode = data.arguments?.getString("recaptchaCode") ?: data.loginStore.getLoginData("recaptchaCode", null) + val recaptchaTime = data.arguments?.getLong("recaptchaTime") ?: data.loginStore.getLoginData("recaptchaTime", 0L) + data.loginStore.removeLoginData("recaptchaCode") + data.loginStore.removeLoginData("recaptchaTime") + Request.builder() .url(if (data.fakeLogin) FAKE_LIBRUS_LOGIN else LIBRUS_LOGIN_URL) .userAgent(LIBRUS_USER_AGENT) .addParameter("email", data.portalEmail) .addParameter("password", data.portalPassword) + .also { + if (recaptchaCode != null && System.currentTimeMillis() - recaptchaTime < 2*60*1000 /* 2 minutes */) + it.addParameter("g-recaptcha-response", recaptchaCode) + } .addHeader("X-CSRF-TOKEN", csrfToken) + .allowErrorCode(HTTP_BAD_REQUEST) + .allowErrorCode(HTTP_FORBIDDEN) .contentType(MediaTypeUtils.APPLICATION_JSON) .post() .callback(object : JsonCallbackHandler() { override fun onSuccess(json: JsonObject?, response: Response) { val location = response.headers()?.get("Location") - if (location == "http://localhost/bar?command=close") { + if (location == "$LIBRUS_REDIRECT_URL?command=close") { data.error(ApiError(TAG, ERROR_LIBRUS_PORTAL_MAINTENANCE) .withApiResponse(json) .withResponse(response)) @@ -117,8 +144,26 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) { .withResponse(response)) return } - if (json.get("errors") != null) { - data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_PORTAL_ACTION_ERROR) + val error = if (response.code() == 200) null else + json.getJsonArray("errors")?.getString(0) + ?: json.getJsonObject("errors")?.entrySet()?.firstOrNull()?.value?.asString + error?.let { code -> + when { + code.contains("Sesja logowania wygasła") -> ERROR_LOGIN_LIBRUS_PORTAL_CSRF_EXPIRED + code.contains("Upewnij się, że nie") -> ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN + // this doesn't work anyway: `errors` is an object with `g-recaptcha-response` set + code.contains("robotem") -> ERROR_CAPTCHA_LIBRUS_PORTAL + code.contains("Podany adres e-mail jest nieprawidłowy.") -> ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN + else -> ERROR_LOGIN_LIBRUS_PORTAL_ACTION_ERROR + }.let { errorCode -> + data.error(ApiError(TAG, errorCode) + .withApiResponse(json) + .withResponse(response)) + return + } + } + if (json.getBoolean("captchaRequired") == true) { + data.error(ApiError(TAG, ERROR_CAPTCHA_LIBRUS_PORTAL) .withResponse(response) .withApiResponse(json)) return @@ -127,12 +172,6 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) { } override fun onFailure(response: Response, throwable: Throwable) { - if (response.code() == 403 || response.code() == 401) { - data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN) - .withResponse(response) - .withThrowable(throwable)) - return - } data.error(ApiError(TAG, ERROR_REQUEST_FAILURE) .withResponse(response) .withThrowable(throwable)) @@ -142,7 +181,6 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) { .enqueue() } - private var refreshTokenFailed = false private fun accessToken(code: String?, refreshToken: String?) { d(TAG, "Request: Librus/Login/Portal - ${if (data.fakeLogin) FAKE_LIBRUS_TOKEN else LIBRUS_TOKEN_URL}") @@ -160,7 +198,7 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) { return } val error = if (response?.code() == 200) null else - json.getString("hint") + json.getString("hint") ?: json.getString("error") error?.let { code -> when (code) { "Authorization code has expired" -> ERROR_LOGIN_LIBRUS_PORTAL_CODE_EXPIRED @@ -171,11 +209,9 @@ class LibrusLoginPortal(val data: DataLibrus, val onSuccess: () -> Unit) { "Check the `code` parameter" -> ERROR_LOGIN_LIBRUS_PORTAL_NO_CODE "Check the `refresh_token` parameter" -> ERROR_LOGIN_LIBRUS_PORTAL_NO_REFRESH "Check the `redirect_uri` parameter" -> ERROR_LOGIN_LIBRUS_PORTAL_NO_REDIRECT - else -> when (json.getString("error")) { - "unsupported_grant_type" -> ERROR_LOGIN_LIBRUS_PORTAL_UNSUPPORTED_GRANT - "invalid_client" -> ERROR_LOGIN_LIBRUS_PORTAL_INVALID_CLIENT_ID - else -> ERROR_LOGIN_LIBRUS_PORTAL_OTHER - } + "unsupported_grant_type" -> ERROR_LOGIN_LIBRUS_PORTAL_UNSUPPORTED_GRANT + "invalid_client" -> ERROR_LOGIN_LIBRUS_PORTAL_INVALID_CLIENT_ID + else -> ERROR_LOGIN_LIBRUS_PORTAL_OTHER }.let { errorCode -> data.error(ApiError(TAG, errorCode) .withApiResponse(json) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginSynergia.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginSynergia.kt index 3e11d502..4a292cfe 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginSynergia.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/LibrusLoginSynergia.kt @@ -8,7 +8,6 @@ import com.google.gson.JsonObject import im.wangchao.mhttp.Request import im.wangchao.mhttp.Response import im.wangchao.mhttp.callback.TextCallbackHandler -import okhttp3.Cookie import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.edziennik.librus.DataLibrus import pl.szczodrzynski.edziennik.data.api.edziennik.librus.data.LibrusApi @@ -18,7 +17,7 @@ import pl.szczodrzynski.edziennik.getUnixDate import pl.szczodrzynski.edziennik.utils.Utils.d import java.net.HttpURLConnection -class LibrusLoginSynergia(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusApi(data) { +class LibrusLoginSynergia(override val data: DataLibrus, val onSuccess: () -> Unit) : LibrusApi(data, null) { companion object { private const val TAG = "LoginLibrusSynergia" } @@ -30,17 +29,11 @@ class LibrusLoginSynergia(override val data: DataLibrus, val onSuccess: () -> Un } if (data.isSynergiaLoginValid()) { - data.app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name("DZIENNIKSID") - .value(data.synergiaSessionId!!) - .domain("synergia.librus.pl") - .secure().httpOnly().build() - )) + data.app.cookieJar.set("synergia.librus.pl", "DZIENNIKSID", data.synergiaSessionId) onSuccess() } else { - data.app.cookieJar.clearForDomain("synergia.librus.pl") + data.app.cookieJar.clear("synergia.librus.pl") if (data.loginMethods.contains(LOGIN_METHOD_LIBRUS_API)) { loginWithApi() } @@ -70,7 +63,7 @@ class LibrusLoginSynergia(override val data: DataLibrus, val onSuccess: () -> Un loginWithToken(json.getString("Token")) } - apiGet(TAG, "AutoLoginToken", POST, null, onSuccess) + apiGet(TAG, "AutoLoginToken", POST, onSuccess = onSuccess) } private fun loginWithToken(token: String?) { @@ -92,7 +85,7 @@ class LibrusLoginSynergia(override val data: DataLibrus, val onSuccess: () -> Un } if (location?.endsWith("centrum_powiadomien") == true) { - val sessionId = data.app.cookieJar.getCookie("synergia.librus.pl", "DZIENNIKSID") + val sessionId = data.app.cookieJar.get("synergia.librus.pl", "DZIENNIKSID") if (sessionId == null) { data.error(ApiError(TAG, ERROR_LOGIN_LIBRUS_SYNERGIA_NO_SESSION_ID) .withResponse(response) @@ -117,7 +110,7 @@ class LibrusLoginSynergia(override val data: DataLibrus, val onSuccess: () -> Un } } - data.app.cookieJar.clearForDomain("synergia.librus.pl") + data.app.cookieJar.clear("synergia.librus.pl") Request.builder() .url(LIBRUS_SYNERGIA_TOKEN_LOGIN_URL.replace("TOKEN", token) + "/uczen/widok/centrum_powiadomien") .userAgent(LIBRUS_USER_AGENT) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/SynergiaTokenExtractor.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/SynergiaTokenExtractor.kt index d9719606..5072e5a2 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/SynergiaTokenExtractor.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/login/SynergiaTokenExtractor.kt @@ -58,11 +58,6 @@ class SynergiaTokenExtractor(override val data: DataLibrus, val onSuccess: () -> data.apiAccessToken = accountToken data.apiTokenExpiryTime = response.getUnixDate() + 6 * 60 * 60 - // TODO remove this - data.profile?.studentNameLong = json.getString("studentName") - val nameParts = json.getString("studentName")?.split(" ") - data.profile?.studentNameShort = nameParts?.get(0) + " " + nameParts?.get(1)?.get(0) - onSuccess() } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/DataMobidziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/DataMobidziennik.kt index 40ba688d..ddfb0113 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/DataMobidziennik.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/DataMobidziennik.kt @@ -5,13 +5,12 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik import android.util.LongSparseArray -import androidx.core.util.isNotEmpty import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.currentTimeUnix import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_MOBIDZIENNIK_WEB import pl.szczodrzynski.edziennik.data.api.models.Data -import pl.szczodrzynski.edziennik.currentTimeUnix -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile import pl.szczodrzynski.edziennik.isNotNullNorEmpty import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time @@ -23,6 +22,10 @@ class DataMobidziennik(app: App, profile: Profile?, loginStore: LoginStore) : Da && webSessionKey.isNotNullNorEmpty() && webServerId.isNotNullNorEmpty() + fun isApi2LoginValid() = loginEmail.isNotNullNorEmpty() + && loginId.isNotNullNorEmpty() + && globalId.isNotNullNorEmpty() + override fun satisfyLoginMethods() { loginMethods.clear() if (isWebLoginValid()) { @@ -30,23 +33,20 @@ class DataMobidziennik(app: App, profile: Profile?, loginStore: LoginStore) : Da } } + override fun generateUserCode() = "$loginServerName:$loginUsername:$studentId" + val teachersMap = LongSparseArray() val subjectsMap = LongSparseArray() - val gradeAddedDates = LongSparseArray() - val gradeAverages = LongSparseArray() - val gradeColors = LongSparseArray() + val gradeAddedDates = sortedMapOf() + val gradeAverages = sortedMapOf() + val gradeColors = sortedMapOf() private var mLoginServerName: String? = null var loginServerName: String? get() { mLoginServerName = mLoginServerName ?: loginStore.getLoginData("serverName", null); return mLoginServerName } set(value) { loginStore.putLoginData("serverName", value); mLoginServerName = value } - private var mLoginEmail: String? = null - var loginEmail: String? - get() { mLoginEmail = mLoginEmail ?: loginStore.getLoginData("email", null); return mLoginEmail } - set(value) { loginStore.putLoginData("email", value); mLoginEmail = value } - private var mLoginUsername: String? = null var loginUsername: String? get() { mLoginUsername = mLoginUsername ?: loginStore.getLoginData("username", null); return mLoginUsername } @@ -88,6 +88,48 @@ class DataMobidziennik(app: App, profile: Profile?, loginStore: LoginStore) : Da get() { mWebSessionIdExpiryTime = mWebSessionIdExpiryTime ?: loginStore.getLoginData("sessionIDTime", 0L); return mWebSessionIdExpiryTime ?: 0L } set(value) { loginStore.putLoginData("sessionIDTime", value); mWebSessionIdExpiryTime = value } + /* _____ _____ ___ + /\ | __ \_ _| |__ \ + / \ | |__) || | ) | + / /\ \ | ___/ | | / / + / ____ \| | _| |_ / /_ + /_/ \_\_| |_____| |___*/ + /** + * A global ID (whatever it is) used in API 2 + * and Firebase push from Mobidziennik. + */ + var globalId: String? + get() { mGlobalId = mGlobalId ?: profile?.getStudentData("globalId", null); return mGlobalId } + set(value) { profile?.putStudentData("globalId", value) ?: return; mGlobalId = value } + private var mGlobalId: String? = null + + /** + * User's email that may or may not + * be retrieved from Web by [MobidziennikWebAccountEmail]. + * Used to log in to API 2. + */ + var loginEmail: String? + get() { mLoginEmail = mLoginEmail ?: profile?.getStudentData("email", null); return mLoginEmail } + set(value) { profile?.putStudentData("email", value); mLoginEmail = value } + private var mLoginEmail: String? = null + + /** + * A login ID used in the API 2. + * Looks more or less like "7063@2019@zslpoznan". + */ + var loginId: String? + get() { mLoginId = mLoginId ?: profile?.getStudentData("loginId", null); return mLoginId } + set(value) { profile?.putStudentData("loginId", value) ?: return; mLoginId = value } + private var mLoginId: String? = null + + /** + * No need to explain. + */ + var ciasteczkoAutoryzacji: String? + get() { mCiasteczkoAutoryzacji = mCiasteczkoAutoryzacji ?: profile?.getStudentData("ciasteczkoAutoryzacji", null); return mCiasteczkoAutoryzacji } + set(value) { profile?.putStudentData("ciasteczkoAutoryzacji", value) ?: return; mCiasteczkoAutoryzacji = value } + private var mCiasteczkoAutoryzacji: String? = null + override fun saveData() { super.saveData() diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/Mobidziennik.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/Mobidziennik.kt index 4b8b822d..0e002576 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/Mobidziennik.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/Mobidziennik.kt @@ -6,22 +6,20 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik import com.google.gson.JsonObject import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.data.api.CODE_INTERNAL_LIBRUS_ACCOUNT_410 +import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikData -import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.MobidziennikWebGetAttachment -import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.MobidziennikWebGetMessage +import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.* import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.firstlogin.MobidziennikFirstLogin import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLogin -import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLoginWeb import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface -import pl.szczodrzynski.edziennik.data.api.mobidziennikLoginMethods import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.api.prepare -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.data.db.full.MessageFull import pl.szczodrzynski.edziennik.utils.Utils.d class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface { @@ -33,6 +31,7 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto val internalErrorList = mutableListOf() val data: DataMobidziennik + private var afterLogin: (() -> Unit)? = null init { data = DataMobidziennik(app, profile, loginStore).apply { @@ -43,9 +42,7 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto private fun completed() { data.saveData() - data.notify { - callback.onCompleted() - } + callback.onCompleted() } /* _______ _ _ _ _ _ @@ -56,44 +53,80 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto |_| |_| |_|\___| /_/ \_\_|\__, |\___/|_| |_|\__|_| |_|_| |_| |_| __/ | |__*/ - override fun sync(featureIds: List, viewId: Int?, arguments: JsonObject?) { + override fun sync(featureIds: List, viewId: Int?, onlyEndpoints: List?, arguments: JsonObject?) { data.arguments = arguments - data.prepare(mobidziennikLoginMethods, MobidziennikFeatures, featureIds, viewId) - d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}") - d(TAG, "Endpoint IDs: ${data.targetEndpointIds}") + data.prepare(mobidziennikLoginMethods, MobidziennikFeatures, featureIds, viewId, onlyEndpoints) + login() + } + + private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) { + d(TAG, "Trying to login with ${data.targetLoginMethodIds}") + if (internalErrorList.isNotEmpty()) { + d(TAG, " - Internal errors:") + internalErrorList.forEach { d(TAG, " - code $it") } + } + loginMethodId?.let { data.prepareFor(mobidziennikLoginMethods, it) } + afterLogin?.let { this.afterLogin = it } MobidziennikLogin(data) { - MobidziennikData(data) { - completed() - } + data() + } + } + + private fun data() { + d(TAG, "Endpoint IDs: ${data.targetEndpointIds}") + if (internalErrorList.isNotEmpty()) { + d(TAG, " - Internal errors:") + internalErrorList.forEach { d(TAG, " - code $it") } + } + afterLogin?.invoke() ?: MobidziennikData(data) { + completed() } } override fun getMessage(message: MessageFull) { - MobidziennikLoginWeb(data) { + login(LOGIN_METHOD_MOBIDZIENNIK_WEB) { MobidziennikWebGetMessage(data, message) { completed() } } } - override fun markAllAnnouncementsAsRead() { - - } - - override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) { - MobidziennikLoginWeb(data) { - MobidziennikWebGetAttachment(data, message, attachmentId, attachmentName) { + override fun sendMessage(recipients: List, subject: String, text: String) { + login(LOGIN_METHOD_MOBIDZIENNIK_WEB) { + MobidziennikWebSendMessage(data, recipients, subject, text) { completed() } } } - override fun firstLogin() { - MobidziennikFirstLogin(data) { - completed() + override fun markAllAnnouncementsAsRead() {} + override fun getAnnouncement(announcement: AnnouncementFull) {} + + override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) { + login(LOGIN_METHOD_MOBIDZIENNIK_WEB) { + MobidziennikWebGetAttachment(data, owner, attachmentId, attachmentName) { + completed() + } } } + override fun getRecipientList() { + login(LOGIN_METHOD_MOBIDZIENNIK_WEB) { + MobidziennikWebGetRecipientList(data) { + completed() + } + } + } + + override fun getEvent(eventFull: EventFull) { + login(LOGIN_METHOD_MOBIDZIENNIK_WEB) { + MobidziennikWebGetHomework(data, eventFull) { + completed() + } + } + } + + override fun firstLogin() { MobidziennikFirstLogin(data) { completed() } } override fun cancel() { d(TAG, "Cancelled") data.cancel() @@ -101,28 +134,25 @@ class Mobidziennik(val app: App, val profile: Profile?, val loginStore: LoginSto private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback { return object : EdziennikCallback { - override fun onCompleted() { - callback.onCompleted() - } - - override fun onProgress(step: Float) { - callback.onProgress(step) - } - - override fun onStartProgress(stringRes: Int) { - callback.onStartProgress(stringRes) - } - + override fun onCompleted() { callback.onCompleted() } + override fun onProgress(step: Float) { callback.onProgress(step) } + override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) } override fun onError(apiError: ApiError) { + if (apiError.errorCode in internalErrorList) { + // finish immediately if the same error occurs twice during the same sync + callback.onError(apiError) + return + } + internalErrorList.add(apiError.errorCode) when (apiError.errorCode) { - in internalErrorList -> { - // finish immediately if the same error occurs twice during the same sync - callback.onError(apiError) - } - CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> { - internalErrorList.add(apiError.errorCode) - loginStore.removeLoginData("refreshToken") // force a clean login - //loginLibrus() + ERROR_MOBIDZIENNIK_WEB_ACCESS_DENIED, + ERROR_MOBIDZIENNIK_WEB_NO_SESSION_KEY, + ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE, + ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID -> { + data.loginMethods.remove(LOGIN_METHOD_MOBIDZIENNIK_WEB) + data.prepareFor(mobidziennikLoginMethods, LOGIN_METHOD_MOBIDZIENNIK_WEB) + data.webSessionIdExpiryTime = 0 + login() } else -> callback.onError(apiError) } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/MobidziennikFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/MobidziennikFeatures.kt index c08846c9..7b39e455 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/MobidziennikFeatures.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/MobidziennikFeatures.kt @@ -17,6 +17,8 @@ const val ENDPOINT_MOBIDZIENNIK_WEB_NOTICES = 2040 const val ENDPOINT_MOBIDZIENNIK_WEB_ATTENDANCE = 2050 const val ENDPOINT_MOBIDZIENNIK_WEB_MANUALS = 2100 const val ENDPOINT_MOBIDZIENNIK_WEB_ACCOUNT_EMAIL = 2200 +const val ENDPOINT_MOBIDZIENNIK_WEB_HOMEWORK = 2300 // not used as an endpoint +const val ENDPOINT_MOBIDZIENNIK_WEB_TIMETABLE = 2400 const val ENDPOINT_MOBIDZIENNIK_API2_MAIN = 3000 val MobidziennikFeatures = listOf( @@ -27,16 +29,22 @@ val MobidziennikFeatures = listOf( ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)), // TODO divide features into separate view IDs (all with API_MAIN) // push config - /*Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_PUSH_CONFIG, listOf( + Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_PUSH_CONFIG, listOf( ENDPOINT_MOBIDZIENNIK_API2_MAIN to LOGIN_METHOD_MOBIDZIENNIK_API2 ), listOf(LOGIN_METHOD_MOBIDZIENNIK_API2)).withShouldSync { data -> - data.app.appConfig.fcmTokens[LOGIN_TYPE_MOBIDZIENNIK]?.second?.contains(data.profileId) == false - },*/ + !data.app.config.sync.tokenMobidziennikList.contains(data.profileId) + }, + /** + * Timetable - web scraping - does nothing if the API_MAIN timetable is enough. + */ + Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_TIMETABLE, listOf( + ENDPOINT_MOBIDZIENNIK_WEB_TIMETABLE to LOGIN_METHOD_MOBIDZIENNIK_WEB + ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB, LOGIN_METHOD_MOBIDZIENNIK_WEB)), /** * Agenda - "API" + web scraping. */ @@ -58,10 +66,12 @@ val MobidziennikFeatures = listOf( ENDPOINT_MOBIDZIENNIK_API_MAIN to LOGIN_METHOD_MOBIDZIENNIK_WEB, ENDPOINT_MOBIDZIENNIK_WEB_NOTICES to LOGIN_METHOD_MOBIDZIENNIK_WEB ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB, LOGIN_METHOD_MOBIDZIENNIK_WEB)), - // attendance TODO implement website attendance scraping - /*Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_ATTENDANCE, listOf( + /** + * Attendance - only web scraping. + */ + Feature(LOGIN_TYPE_MOBIDZIENNIK, FEATURE_ATTENDANCE, listOf( ENDPOINT_MOBIDZIENNIK_WEB_ATTENDANCE to LOGIN_METHOD_MOBIDZIENNIK_WEB - ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)),*/ + ), listOf(LOGIN_METHOD_MOBIDZIENNIK_WEB)), diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/MobidziennikData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/MobidziennikData.kt index 0ceeb49a..b82f6355 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/MobidziennikData.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/MobidziennikData.kt @@ -7,10 +7,8 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data import pl.szczodrzynski.edziennik.R import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.* import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api.MobidziennikApi -import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.MobidziennikWebCalendar -import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.MobidziennikWebGrades -import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.MobidziennikWebMessagesAll -import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.MobidziennikWebMessagesInbox +import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api2.MobidziennikApi2Main +import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.web.* import pl.szczodrzynski.edziennik.utils.Utils class MobidziennikData(val data: DataMobidziennik, val onSuccess: () -> Unit) { @@ -31,48 +29,66 @@ class MobidziennikData(val data: DataMobidziennik, val onSuccess: () -> Unit) { onSuccess() return } - useEndpoint(data.targetEndpointIds.removeAt(0)) { + val id = data.targetEndpointIds.firstKey() + val lastSync = data.targetEndpointIds.remove(id) + useEndpoint(id, lastSync) { endpointId -> data.progress(data.progressStep) nextEndpoint(onSuccess) } } - private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) { - Utils.d(TAG, "Using endpoint $endpointId") + private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) { + Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync") when (endpointId) { ENDPOINT_MOBIDZIENNIK_API_MAIN -> { data.startProgress(R.string.edziennik_progress_endpoint_data) - MobidziennikApi(data, onSuccess) + MobidziennikApi(data, lastSync, onSuccess) + } + ENDPOINT_MOBIDZIENNIK_API2_MAIN -> { + data.startProgress(R.string.edziennik_progress_endpoint_push_config) + MobidziennikApi2Main(data, lastSync, onSuccess) } ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX -> { data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox) - MobidziennikWebMessagesInbox(data) { onSuccess() } + MobidziennikWebMessagesInbox(data, lastSync, onSuccess) + } + ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_SENT -> { + data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox) + MobidziennikWebMessagesSent(data, lastSync, onSuccess) } ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_ALL -> { data.startProgress(R.string.edziennik_progress_endpoint_messages) - MobidziennikWebMessagesAll(data) { onSuccess() } + MobidziennikWebMessagesAll(data, lastSync, onSuccess) } ENDPOINT_MOBIDZIENNIK_WEB_CALENDAR -> { data.startProgress(R.string.edziennik_progress_endpoint_calendar) - MobidziennikWebCalendar(data) { onSuccess() } + MobidziennikWebCalendar(data, lastSync, onSuccess) } ENDPOINT_MOBIDZIENNIK_WEB_GRADES -> { data.startProgress(R.string.edziennik_progress_endpoint_grades) - MobidziennikWebGrades(data) { onSuccess() } - }/* - ENDPOINT_MOBIDZIENNIK_WEB_NOTICES -> { - data.startProgress(R.string.edziennik_progress_endpoint_behaviour) - MobidziennikWebNotices(data) { onSuccess() } + MobidziennikWebGrades(data, lastSync, onSuccess) + } + ENDPOINT_MOBIDZIENNIK_WEB_ACCOUNT_EMAIL -> { + data.startProgress(R.string.edziennik_progress_endpoint_account_details) + MobidziennikWebAccountEmail(data, lastSync, onSuccess) } ENDPOINT_MOBIDZIENNIK_WEB_ATTENDANCE -> { data.startProgress(R.string.edziennik_progress_endpoint_attendance) - MobidziennikWebAttendance(data) { onSuccess() } - } + MobidziennikWebAttendance(data, lastSync, onSuccess) + }/* + ENDPOINT_MOBIDZIENNIK_WEB_NOTICES -> { + data.startProgress(R.string.edziennik_progress_endpoint_behaviour) + MobidziennikWebNotices(data, lastSync, onSuccess) + }] ENDPOINT_MOBIDZIENNIK_WEB_MANUALS -> { data.startProgress(R.string.edziennik_progress_endpoint_lucky_number) - MobidziennikWebManuals(data) { onSuccess() } + MobidziennikWebManuals(data, lastSync, onSuccess) }*/ - else -> onSuccess() + ENDPOINT_MOBIDZIENNIK_WEB_TIMETABLE-> { + data.startProgress(R.string.edziennik_progress_endpoint_timetable) + MobidziennikWebTimetable(data, lastSync, onSuccess) + } + else -> onSuccess(endpointId) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/MobidziennikWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/MobidziennikWeb.kt index 6a1fc1dc..cfb4ab49 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/MobidziennikWeb.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/MobidziennikWeb.kt @@ -8,14 +8,13 @@ import im.wangchao.mhttp.Request import im.wangchao.mhttp.Response import im.wangchao.mhttp.callback.FileCallbackHandler import im.wangchao.mhttp.callback.TextCallbackHandler -import okhttp3.Cookie import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik import pl.szczodrzynski.edziennik.data.api.models.ApiError import pl.szczodrzynski.edziennik.utils.Utils.d import java.io.File -open class MobidziennikWeb(open val data: DataMobidziennik) { +open class MobidziennikWeb(open val data: DataMobidziennik, open val lastSync: Long?) { companion object { private const val TAG = "MobidziennikWeb" } @@ -26,8 +25,32 @@ open class MobidziennikWeb(open val data: DataMobidziennik) { val profile get() = data.profile - fun webGet(tag: String, endpoint: String, method: Int = GET, onSuccess: (text: String) -> Unit) { - val url = "https://${data.loginServerName}.mobidziennik.pl$endpoint" + /* TODO + add error handling: + + +
    + +

    Ważna informacja!

    + +
    + Korzystasz z hasła, które zostało wygenerowane automatycznie.
    + Pamiętaj, aby je zmienić oraz uzupełnić dane w swoim profilu.

    + Obie te operacje można wykonać uruchamiając opcję + Moje konto->Edycja profilu. +
    + + */ + + fun webGet( + tag: String, + endpoint: String, + method: Int = GET, + parameters: List> = emptyList(), + fullUrl: String? = null, + onSuccess: (text: String) -> Unit + ) { + val url = fullUrl ?: "https://${data.loginServerName}.mobidziennik.pl$endpoint" d(tag, "Request: Mobidziennik/Web - $url") @@ -58,6 +81,12 @@ open class MobidziennikWeb(open val data: DataMobidziennik) { return } + if (text.contains("

    Problemy z wydajnością

    ")) { + data.error(ApiError(TAG, ERROR_MOBIDZIENNIK_WEB_SERVER_PROBLEM) + .withResponse(response)) + return + } + try { onSuccess(text) } catch (e: Exception) { @@ -75,22 +104,21 @@ open class MobidziennikWeb(open val data: DataMobidziennik) { } } - data.app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name(data.webSessionKey!!) - .value(data.webSessionValue!!) - .domain("${data.loginServerName}.mobidziennik.pl") - .secure().httpOnly().build(), - Cookie.Builder() - .name("SERVERID") - .value(data.webServerId!!) - .domain("${data.loginServerName}.mobidziennik.pl") - .secure().httpOnly().build() - )) + data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", data.webSessionKey, data.webSessionValue) + data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", "SERVERID", data.webServerId) Request.builder() .url(url) .userAgent(MOBIDZIENNIK_USER_AGENT) + .apply { + when (method) { + GET -> get() + POST -> post() + } + parameters.map { (name, value) -> + addParameter(name, value) + } + } .callback(callback) .build() .enqueue() @@ -148,18 +176,8 @@ open class MobidziennikWeb(open val data: DataMobidziennik) { } } - data.app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name(data.webSessionKey!!) - .value(data.webSessionValue!!) - .domain("${data.loginServerName}.mobidziennik.pl") - .secure().httpOnly().build(), - Cookie.Builder() - .name("SERVERID") - .value(data.webServerId!!) - .domain("${data.loginServerName}.mobidziennik.pl") - .secure().httpOnly().build() - )) + data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", data.webSessionKey, data.webSessionValue) + data.app.cookieJar.set("${data.loginServerName}.mobidziennik.pl", "SERVERID", data.webServerId) Request.builder() .url(url) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApi.kt index 543f21dc..323aeb14 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApi.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApi.kt @@ -9,10 +9,12 @@ import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidzienn import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.ENDPOINT_MOBIDZIENNIK_API_MAIN import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikWeb import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS class MobidziennikApi(override val data: DataMobidziennik, - val onSuccess: () -> Unit) : MobidziennikWeb(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : MobidziennikWeb(data, lastSync) { companion object { private const val TAG = "MobidziennikApi" } @@ -37,7 +39,7 @@ class MobidziennikApi(override val data: DataMobidziennik, 9 -> MobidziennikApiTeams(data, null, rows) 14 -> MobidziennikApiGradeCategories(data, rows) 15 -> MobidziennikApiLessons(data, rows) - 16 -> MobidziennikApiAttendance(data, rows) + //16 -> MobidziennikApiAttendance(data, rows) // disabled since the new web scrapper is used 17 -> MobidziennikApiNotices(data, rows) 18 -> MobidziennikApiGrades(data, rows) 21 -> MobidziennikApiEvents(data, rows) @@ -47,7 +49,7 @@ class MobidziennikApi(override val data: DataMobidziennik, } data.setSyncNext(ENDPOINT_MOBIDZIENNIK_API_MAIN, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_MOBIDZIENNIK_API_MAIN) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiAttendance.kt index 76369615..473b3691 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiAttendance.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiAttendance.kt @@ -5,9 +5,12 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.* -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT +import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_ABSENT_EXCUSED +import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_PRESENT +import pl.szczodrzynski.edziennik.data.db.entity.Attendance.Companion.TYPE_RELEASED +import pl.szczodrzynski.edziennik.data.db.entity.Metadata class MobidziennikApiAttendance(val data: DataMobidziennik, rows: List) { init { run { @@ -23,7 +26,7 @@ class MobidziennikApiAttendance(val data: DataMobidziennik, rows: List) val id = cols[0].toLong() val lessonId = cols[1].toLong() data.mobiLessons.singleOrNull { it.id == lessonId }?.let { lesson -> - val type = when (cols[4]) { + val baseType = when (cols[4]) { "2" -> TYPE_ABSENT "5" -> TYPE_ABSENT_EXCUSED "4" -> TYPE_RELEASED @@ -31,16 +34,37 @@ class MobidziennikApiAttendance(val data: DataMobidziennik, rows: List) } val semester = data.profile?.dateToSemester(lesson.date) ?: 1 + val typeName = when (baseType) { + TYPE_ABSENT -> "nieobecność" + TYPE_ABSENT_EXCUSED -> "nieobecność usprawiedliwiona" + TYPE_RELEASED -> "zwolnienie" + TYPE_PRESENT -> "obecność" + else -> "nieznany rodzaj" + } + val typeSymbol = when (baseType) { + TYPE_ABSENT -> "|" + TYPE_ABSENT_EXCUSED -> "+" + TYPE_RELEASED -> "z" + TYPE_PRESENT -> "." + else -> "?" + } + val attendanceObject = Attendance( - data.profileId, - id, - lesson.teacherId, - lesson.subjectId, - semester, - lesson.topic, - lesson.date, - lesson.startTime, - type) + profileId = data.profileId, + id = id, + baseType = baseType, + typeName = typeName, + typeShort = data.app.attendanceManager.getTypeShort(baseType), + typeSymbol = typeSymbol, + typeColor = null, + date = lesson.date, + startTime = lesson.startTime, + semester = semester, + teacherId = lesson.teacherId, + subjectId = lesson.subjectId + ).also { + it.lessonTopic = lesson.topic + } data.attendanceList.add(attendanceObject) data.metadataList.add( @@ -48,9 +72,8 @@ class MobidziennikApiAttendance(val data: DataMobidziennik, rows: List) data.profileId, Metadata.TYPE_ATTENDANCE, id, - data.profile?.empty ?: false, - data.profile?.empty ?: false, - System.currentTimeMillis() + data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == Attendance.TYPE_UNKNOWN, + data.profile?.empty ?: false || baseType == Attendance.TYPE_PRESENT_CUSTOM || baseType == Attendance.TYPE_UNKNOWN )) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiEvents.kt index adfdee11..7a72d3de 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiEvents.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiEvents.kt @@ -8,8 +8,8 @@ import androidx.core.util.contains import pl.szczodrzynski.edziennik.data.api.Regexes import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time import java.text.ParseException @@ -30,7 +30,7 @@ class MobidziennikApiEvents(val data: DataMobidziennik, rows: List) { val teacherId = cols[1].toLong() val subjectId = cols[3].toLong() var type = Event.TYPE_DEFAULT - var topic = cols[5] + var topic = cols[5].trim() Regexes.MOBIDZIENNIK_EVENT_TYPE.find(topic)?.let { val typeText = it.groupValues[1] when (typeText) { @@ -51,17 +51,18 @@ class MobidziennikApiEvents(val data: DataMobidziennik, rows: List) { val eventObject = Event( - data.profileId, - id, - eventDate, - startTime, - topic, - -1, - type, - false, - teacherId, - subjectId, - teamId) + profileId = data.profileId, + id = id, + date = eventDate, + time = startTime, + topic = topic, + color = null, + type = type, + teacherId = teacherId, + subjectId = subjectId, + teamId = teamId, + addedDate = addedDate + ) data.eventList.add(eventObject) data.metadataList.add( @@ -70,12 +71,13 @@ class MobidziennikApiEvents(val data: DataMobidziennik, rows: List) { Metadata.TYPE_EVENT, id, data.profile?.empty ?: false, - data.profile?.empty ?: false, - addedDate + data.profile?.empty ?: false )) } } - data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK)) + data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_DEFAULT)) + data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_EXAM)) + data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_SHORT_QUIZ)) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiGradeCategories.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiGradeCategories.kt index 87b069cc..b3bb8177 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiGradeCategories.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiGradeCategories.kt @@ -7,7 +7,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api import android.graphics.Color import androidx.core.util.contains import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory class MobidziennikApiGradeCategories(val data: DataMobidziennik, rows: List) { init { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiGrades.kt index 16e73363..c3c1b449 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiGrades.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiGrades.kt @@ -5,12 +5,19 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade.* -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_NORMAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.Metadata class MobidziennikApiGrades(val data: DataMobidziennik, rows: List) { - init { run { + init { data.profile?.also { profile -> run { data.db.gradeDao().getDetails( data.profileId, data.gradeAddedDates, @@ -60,18 +67,25 @@ class MobidziennikApiGrades(val data: DataMobidziennik, rows: List) { } val gradeObject = Grade( - data.profileId, - id, - category, - color, - description, - name, - value, - weight, - semester, - teacherId, - subjectId) - gradeObject.type = type + profileId = data.profileId, + id = id, + name = name, + type = type, + value = value, + weight = weight, + color = color, + category = category, + description = description, + comment = null, + semester = semester, + teacherId = teacherId, + subjectId = subjectId, + addedDate = addedDate + ) + + if (data.profile?.empty == true) { + addedDate = data.profile.dateSemester1Start.inMillis + } data.gradeList.add(gradeObject) data.metadataList.add( @@ -80,10 +94,20 @@ class MobidziennikApiGrades(val data: DataMobidziennik, rows: List) { Metadata.TYPE_GRADE, id, data.profile?.empty ?: false, - data.profile?.empty ?: false, - addedDate + data.profile?.empty ?: false )) addedDate++ } - }} + data.toRemove.addAll(listOf( + TYPE_NORMAL, + TYPE_SEMESTER1_FINAL, + TYPE_SEMESTER2_FINAL, + TYPE_SEMESTER1_PROPOSED, + TYPE_SEMESTER2_PROPOSED, + TYPE_YEAR_FINAL, + TYPE_YEAR_PROPOSED + ).map { + DataRemoveModel.Grades.semesterWithType(profile.currentSemester, it) + }) + }}} } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiHomework.kt index 37605401..683a8820 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiHomework.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiHomework.kt @@ -4,11 +4,12 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api +import android.text.Html import androidx.core.util.contains import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time @@ -25,22 +26,22 @@ class MobidziennikApiHomework(val data: DataMobidziennik, rows: List) { val id = cols[0].toLong() val teacherId = cols[7].toLong() val subjectId = cols[6].toLong() - val topic = cols[1] + val topic = Html.fromHtml(cols[1])?.toString()?.trim() ?: "" val eventDate = Date.fromYmd(cols[2]) val startTime = Time.fromYmdHm(cols[3]) val eventObject = Event( - data.profileId, - id, - eventDate, - startTime, - topic, - -1, - Event.TYPE_HOMEWORK, - false, - teacherId, - subjectId, - teamId) + profileId = data.profileId, + id = id, + date = eventDate, + time = startTime, + topic = topic, + color = null, + type = Event.TYPE_HOMEWORK, + teacherId = teacherId, + subjectId = subjectId, + teamId = teamId + ) data.eventList.add(eventObject) data.metadataList.add( @@ -49,8 +50,7 @@ class MobidziennikApiHomework(val data: DataMobidziennik, rows: List) { Metadata.TYPE_HOMEWORK, id, data.profile?.empty ?: false, - data.profile?.empty ?: false, - System.currentTimeMillis() + data.profile?.empty ?: false )) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiNotices.kt index 5520f490..66bfe1fd 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiNotices.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiNotices.kt @@ -5,8 +5,8 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Notice import pl.szczodrzynski.edziennik.utils.models.Date class MobidziennikApiNotices(val data: DataMobidziennik, rows: List) { @@ -33,12 +33,16 @@ class MobidziennikApiNotices(val data: DataMobidziennik, rows: List) { val addedDate = Date.fromYmd(cols[7]).inMillis val noticeObject = Notice( - data.profileId, - id, - text, - semester, - type, - teacherId) + profileId = data.profileId, + id = id, + type = type, + semester = semester, + text = text, + category = null, + points = null, + teacherId = teacherId, + addedDate = addedDate + ) data.noticeList.add(noticeObject) data.metadataList.add( @@ -47,8 +51,7 @@ class MobidziennikApiNotices(val data: DataMobidziennik, rows: List) { Metadata.TYPE_NOTICE, id, data.profile?.empty ?: false, - data.profile?.empty ?: false, - addedDate + data.profile?.empty ?: false )) } }} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiSubjects.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiSubjects.kt index eb2cef64..ce635860 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiSubjects.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiSubjects.kt @@ -5,7 +5,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik -import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject +import pl.szczodrzynski.edziennik.data.db.entity.Subject class MobidziennikApiSubjects(val data: DataMobidziennik, rows: List) { init { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTeams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTeams.kt index 309e9cdb..6440b04e 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTeams.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTeams.kt @@ -5,7 +5,7 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team +import pl.szczodrzynski.edziennik.data.db.entity.Team import pl.szczodrzynski.edziennik.getById import pl.szczodrzynski.edziennik.values @@ -44,7 +44,7 @@ class MobidziennikApiTeams(val data: DataMobidziennik, tableTeams: List? val studentId = cols[1].toInt() val teamId = cols[2].toLong() - val studentNumber = cols[4].toInt() + val studentNumber = cols[4].toIntOrNull() ?: -1 if (studentId != data.studentId) continue @@ -53,6 +53,7 @@ class MobidziennikApiTeams(val data: DataMobidziennik, tableTeams: List? if (team.type == 1) { data.profile?.studentNumber = studentNumber data.teamClass = team + data.profile?.studentClassName = team.name } data.teamList.put(teamId, team) } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTimetable.kt index 1832e2fe..aa07b1c3 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTimetable.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/api/MobidziennikApiTimetable.kt @@ -4,11 +4,15 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.api +import android.util.SparseArray +import androidx.core.util.set import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson +import pl.szczodrzynski.edziennik.data.db.entity.Lesson +import pl.szczodrzynski.edziennik.data.db.entity.LessonRange +import pl.szczodrzynski.edziennik.data.db.entity.Metadata import pl.szczodrzynski.edziennik.fixName +import pl.szczodrzynski.edziennik.keys import pl.szczodrzynski.edziennik.singleOrNull import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time @@ -28,14 +32,19 @@ class MobidziennikApiTimetable(val data: DataMobidziennik, rows: List) { dataStart.stepForward(0, 0, 1) } + val lessonRanges = SparseArray    ")) -> { + toRemove.add(item) + } + + item.contains("(") && item.contains(")") -> { + classroomName = classroomRegex.find(item)?.get(1) + items[i] = item.replace("($classroomName)", "").trim() + } + classroomName != null && item.contains(classroomName!!) -> { + items[i] = item.replace("($classroomName)", "").trim() + } + + item.contains("class=\"wyjatek tooltip\"") -> + toRemove.add(item) + } + } + items.removeAll(toRemove) + } + + if (items.size == 2 && items[0].contains(" - ")) { + val parts = items[0].split(" - ") + teamName = parts[0] + teacherName = parts[1] + } + else if (items.size == 2 && typeName?.contains("odwołana") == true) { + teamName = items[0] + } + else if (items.size == 4) { + teamName = items[0] + teacherName = items[1] + } + + val type = when (typeName) { + "zastępstwo" -> Lesson.TYPE_CHANGE + "lekcja odwołana", "odwołana" -> Lesson.TYPE_CANCELLED + else -> Lesson.TYPE_NORMAL + } + val subject = subjectName?.let { data.getSubject(null, it) } + val teacher = teacherName?.let { data.getTeacherByLastFirst(it) } + val team = teamName?.let { data.getTeam( + id = null, + name = it, + schoolCode = data.loginServerName ?: return@let null, + isTeamClass = false + ) } + + Lesson(data.profileId, -1).also { + it.type = type + if (type == Lesson.TYPE_CANCELLED) { + it.oldDate = lessonDate + it.oldLessonNumber = lessonNumber + it.oldStartTime = startTime + it.oldEndTime = endTime + it.oldSubjectId = subject?.id ?: -1 + it.oldTeamId = team?.id ?: -1 + } + else { + it.date = lessonDate + it.lessonNumber = lessonNumber + it.startTime = startTime + it.endTime = endTime + it.subjectId = subject?.id ?: -1 + it.teacherId = teacher?.id ?: -1 + it.teamId = team?.id ?: -1 + it.classroom = classroomName + } + + it.id = it.buildId() + + val seen = profile?.empty == false || lessonDate < Date.getToday() + + if (it.type != Lesson.TYPE_NORMAL) { + data.metadataList.add( + Metadata( + data.profileId, + Metadata.TYPE_LESSON_CHANGE, + it.id, + seen, + seen + ) + ) + } + data.lessonList += it + } + } + + for (date in noLessonDays) { + data.lessonList += Lesson(data.profileId, date.value.toLong()).also { + it.type = Lesson.TYPE_NO_LESSONS + it.date = date + } + } + } +} + diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/firstlogin/MobidziennikFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/firstlogin/MobidziennikFirstLogin.kt index 716f4937..11b668f9 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/firstlogin/MobidziennikFirstLogin.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/firstlogin/MobidziennikFirstLogin.kt @@ -1,12 +1,14 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.firstlogin import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.data.MobidziennikWeb import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login.MobidziennikLoginWeb import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Profile import pl.szczodrzynski.edziennik.fixName +import pl.szczodrzynski.edziennik.set import pl.szczodrzynski.edziennik.utils.models.Date class MobidziennikFirstLogin(val data: DataMobidziennik, val onSuccess: () -> Unit) { @@ -14,10 +16,14 @@ class MobidziennikFirstLogin(val data: DataMobidziennik, val onSuccess: () -> Un private const val TAG = "MobidziennikFirstLogin" } - private val web = MobidziennikWeb(data) + private val web = MobidziennikWeb(data, null) private val profileList = mutableListOf() init { + val loginStoreId = data.loginStore.id + val loginStoreType = LOGIN_TYPE_MOBIDZIENNIK + var firstProfileId = loginStoreId + MobidziennikLoginWeb(data) { web.webGet(TAG, "/api/zrzutbazy") { text -> val tables = text.split("T@B#LA") @@ -32,6 +38,21 @@ class MobidziennikFirstLogin(val data: DataMobidziennik, val onSuccess: () -> Un } } + var dateSemester1Start: Date? = null + var dateSemester2Start: Date? = null + var dateYearEnd: Date? = null + for (row in tables[3].split("\n")) { + if (row.isEmpty()) + continue + val cols = row.split("|") + + when (cols[1]) { + "semestr1_poczatek" -> dateSemester1Start = Date.fromYmd(cols[3]) + "semestr2_poczatek" -> dateSemester2Start = Date.fromYmd(cols[3]) + "koniec_roku_szkolnego" -> dateYearEnd = Date.fromYmd(cols[3]) + } + } + tables[8].split("\n").forEach { student -> if (student.isEmpty()) return@forEach @@ -39,20 +60,32 @@ class MobidziennikFirstLogin(val data: DataMobidziennik, val onSuccess: () -> Un if (student1.size == 2) return@forEach - val today = Date.getToday() - val profile = Profile() - profile.studentNameLong = "${student1[2]} ${student1[4]}".fixName() - profile.studentNameShort = "${student1[2]} ${student1[4][0]}.".fixName() - profile.accountNameLong = if (accountNameLong == profile.studentNameLong) null else accountNameLong - profile.studentSchoolYear = "${today.year}/${today.year+1}" - profile.name = profile.studentNameLong - profile.subname = data.loginUsername - profile.empty = true - profile.putStudentData("studentId", student1[0].toInt()) + val studentNameLong = "${student1[2]} ${student1[4]}".fixName() + val studentNameShort = "${student1[2]} ${student1[4][0]}.".fixName() + val accountName = if (accountNameLong == studentNameLong) null else accountNameLong + + val profile = Profile( + firstProfileId++, + loginStoreId, + loginStoreType, + studentNameLong, + data.loginUsername, + studentNameLong, + studentNameShort, + accountName + ).apply { + studentData["studentId"] = student1[0].toInt() + } + dateSemester1Start?.let { + profile.dateSemester1Start = it + profile.studentSchoolYearStart = it.year + } + dateSemester2Start?.let { profile.dateSemester2Start = it } + dateYearEnd?.let { profile.dateYearEnd = it } profileList.add(profile) } - EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore)) + EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore)) onSuccess() } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLogin.kt index 498ab2e3..7bc79a7b 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLogin.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLogin.kt @@ -52,7 +52,7 @@ class MobidziennikLogin(val data: DataMobidziennik, val onSuccess: () -> Unit) { } LOGIN_METHOD_MOBIDZIENNIK_API2 -> { data.startProgress(R.string.edziennik_progress_login_mobidziennik_api2) - //MobidziennikLoginApi2(data) { onSuccess(loginMethodId) } + MobidziennikLoginApi2(data) { onSuccess(loginMethodId) } } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginApi2.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginApi2.kt new file mode 100644 index 00000000..db750981 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginApi2.kt @@ -0,0 +1,102 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-12. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.login + +import android.os.Build +import com.google.gson.JsonObject +import im.wangchao.mhttp.Request +import im.wangchao.mhttp.Response +import im.wangchao.mhttp.callback.JsonCallbackHandler +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.DataMobidziennik +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.utils.Utils + +class MobidziennikLoginApi2(val data: DataMobidziennik, val onSuccess: () -> Unit) { + companion object { + private const val TAG = "MobidziennikLoginApi2" + + fun getDevice(app: App) = JsonObject( + "available" to true, + "platform" to "Android", + "version" to Build.VERSION.RELEASE, + "uuid" to app.deviceId, + "cordova" to "7.1.2", + "model" to "${Build.MANUFACTURER} ${Build.MODEL}", + "manufacturer" to "Aplikacja Szkolny.eu", + "isVirtual" to false, + "serial" to try { System.getProperty("ro.serialno") ?: System.getProperty("ro.boot.serialno") } catch (_: Exception) { Build.UNKNOWN }, + "appVersion" to "10.6, 2020.01.09-12.15.53", + "pushRegistrationId" to app.config.sync.tokenMobidziennik + ) + } + + init { run { + if (data.isApi2LoginValid()) { + onSuccess() + } + else { + if (data.loginServerName.isNotNullNorEmpty() && data.loginEmail.isNotNullNorEmpty() && data.loginPassword.isNotNullNorEmpty()) { + loginWithCredentials() + } + else { + data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING)) + } + } + }} + + private fun loginWithCredentials() { + Utils.d(TAG, "Request: Mobidziennik/Login/Api2 - https://mobidziennik.pl/logowanie") + + val callback = object : JsonCallbackHandler() { + override fun onSuccess(json: JsonObject?, response: Response?) { + if (json == null) { + data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) + .withResponse(response)) + return + } + + json.getJsonObject("error")?.let { + val text = it.getString("type") ?: it.getString("message") + when (text) { + "LOGIN_ERROR" -> ERROR_LOGIN_MOBIDZIENNIK_API2_INVALID_LOGIN + // TODO other error types + else -> ERROR_LOGIN_MOBIDZIENNIK_API2_OTHER + }.let { errorCode -> + data.error(ApiError(TAG, errorCode) + .withApiResponse(text) + .withResponse(response)) + return + } + } + + data.loginEmail = json.getString("email") + data.globalId = json.getString("id_global") + data.loginId = json.getString("login") + onSuccess() + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + data.error(ApiError(TAG, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + } + + Request.builder() + .url("https://mobidziennik.pl/logowanie") + .userAgent(MOBIDZIENNIK_USER_AGENT) + .contentType("application/x-www-form-urlencoded; charset=UTF-8") + .addParameter("api2", true) + .addParameter("email", data.loginEmail) + .addParameter("haslo", data.loginPassword) + .addParameter("device", getDevice(data.app).toString()) + .post() + .callback(callback) + .build() + .enqueue() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginWeb.kt index dbd3f86f..78526b0c 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginWeb.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/login/MobidziennikLoginWeb.kt @@ -26,7 +26,7 @@ class MobidziennikLoginWeb(val data: DataMobidziennik, val onSuccess: () -> Unit } else { if (data.loginServerName.isNotNullNorEmpty() && data.loginUsername.isNotNullNorEmpty() && data.loginPassword.isNotNullNorEmpty()) { - data.app.cookieJar.clearForDomain(data.loginServerName + ".mobidziennik.pl") + data.app.cookieJar.clear("${data.loginServerName}.mobidziennik.pl") loginWithCredentials() } else { @@ -58,10 +58,10 @@ class MobidziennikLoginWeb(val data: DataMobidziennik, val onSuccess: () -> Unit } } - val cookies = data.app.cookieJar.getForDomain("${data.loginServerName}.mobidziennik.pl") - val cookie = cookies.singleOrNull { it.name().length > 32 } - val sessionKey = cookie?.name() - val sessionId = cookie?.value() + val cookies = data.app.cookieJar.getAll("${data.loginServerName}.mobidziennik.pl") + val cookie = cookies.entries.firstOrNull { it.key.length > 32 } + val sessionKey = cookie?.key + val sessionId = cookie?.value if (sessionId == null) { data.error(ApiError(TAG, ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID) .withResponse(response) @@ -71,7 +71,7 @@ class MobidziennikLoginWeb(val data: DataMobidziennik, val onSuccess: () -> Unit data.webSessionKey = sessionKey data.webSessionValue = sessionId - data.webServerId = data.app.cookieJar.getCookie("${data.loginServerName}.mobidziennik.pl", "SERVERID") + data.webServerId = data.app.cookieJar.get("${data.loginServerName}.mobidziennik.pl", "SERVERID") data.webSessionIdExpiryTime = response.getUnixDate() + 45 * 60 /* 45min */ onSuccess() } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/DataPodlasie.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/DataPodlasie.kt new file mode 100644 index 00000000..7962de7e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/DataPodlasie.kt @@ -0,0 +1,84 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-12 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie + +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_PODLASIE_API +import pl.szczodrzynski.edziennik.data.api.models.Data +import pl.szczodrzynski.edziennik.data.db.entity.* +import kotlin.text.replace + +class DataPodlasie(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) { + + fun isApiLoginValid() = apiToken.isNotNullNorEmpty() + + override fun satisfyLoginMethods() { + loginMethods.clear() + if (isApiLoginValid()) + loginMethods += LOGIN_METHOD_PODLASIE_API + } + + override fun generateUserCode(): String = "$schoolShortName:$loginShort:${studentId?.crc32()}" + + /* _ + /\ (_) + / \ _ __ _ + / /\ \ | '_ \| | + / ____ \| |_) | | + /_/ \_\ .__/|_| + | | + |*/ + private var mApiToken: String? = null + var apiToken: String? + get() { mApiToken = mApiToken ?: loginStore.getLoginData("apiToken", null); return mApiToken } + set(value) { loginStore.putLoginData("apiToken", value); mApiToken = value } + + private var mApiUrl: String? = null + var apiUrl: String? + get() { mApiUrl = mApiUrl ?: profile?.getStudentData("apiUrl", null); return mApiUrl } + set(value) { profile?.putStudentData("apiUrl", value) ?: return; mApiUrl = value } + + /* ____ _ _ + / __ \| | | | + | | | | |_| |__ ___ _ __ + | | | | __| '_ \ / _ \ '__| + | |__| | |_| | | | __/ | + \____/ \__|_| |_|\___|*/ + private var mStudentId: String? = null + var studentId: String? + get() { mStudentId = mStudentId ?: profile?.getStudentData("studentId", null); return mStudentId } + set(value) { profile?.putStudentData("studentId", value) ?: return; mStudentId = value } + + private var mStudentLogin: String? = null + var studentLogin: String? + get() { mStudentLogin = mStudentLogin ?: profile?.getStudentData("studentLogin", null); return mStudentLogin } + set(value) { profile?.putStudentData("studentLogin", value) ?: return; mStudentLogin = value } + + private var mSchoolName: String? = null + var schoolName: String? + get() { mSchoolName = mSchoolName ?: profile?.getStudentData("schoolName", null); return mSchoolName } + set(value) { profile?.putStudentData("schoolName", value) ?: return; mSchoolName = value } + + private var mClassName: String? = null + var className: String? + get() { mClassName = mClassName ?: profile?.getStudentData("className", null); return mClassName } + set(value) { profile?.putStudentData("className", value) ?: return; mClassName = value } + + private var mSchoolYear: String? = null + var schoolYear: String? + get() { mSchoolYear = mSchoolYear ?: profile?.getStudentData("schoolYear", null); return mSchoolYear } + set(value) { profile?.putStudentData("schoolYear", value) ?: return; mSchoolYear = value } + + private var mCurrentSemester: Int? = null + var currentSemester: Int + get() { mCurrentSemester = mCurrentSemester ?: profile?.getStudentData("currentSemester", 0); return mCurrentSemester ?: 0 } + set(value) { profile?.putStudentData("currentSemester", value) ?: return; mCurrentSemester = value } + + val schoolShortName: String? + get() = studentLogin?.split('@')?.get(1)?.replace(".podlaskie.pl", "") + + val loginShort: String? + get() = studentLogin?.split('@')?.get(0) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/Podlasie.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/Podlasie.kt new file mode 100644 index 00000000..d7ec441f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/Podlasie.kt @@ -0,0 +1,166 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-12 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie + +import com.google.gson.JsonObject +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.api.edziennik.helper.DownloadAttachment +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.PodlasieData +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.firstlogin.PodlasieFirstLogin +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login.PodlasieLogin +import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent +import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback +import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.data.api.podlasieLoginMethods +import pl.szczodrzynski.edziennik.data.api.prepare +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.data.db.full.MessageFull +import pl.szczodrzynski.edziennik.utils.Utils +import java.io.File + +class Podlasie(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface { + companion object { + const val TAG = "Podlasie" + } + + val internalErrorList = mutableListOf() + val data: DataPodlasie + + init { + data = DataPodlasie(app, profile, loginStore).apply { + callback = wrapCallback(this@Podlasie.callback) + satisfyLoginMethods() + } + } + + private fun completed() { + data.saveData() + callback.onCompleted() + } + + /* _______ _ _ _ _ _ + |__ __| | /\ | | (_) | | | + | | | |__ ___ / \ | | __ _ ___ _ __ _| |_| |__ _ __ ___ + | | | '_ \ / _ \ / /\ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \ + | | | | | | __/ / ____ \| | (_| | (_) | | | | |_| | | | | | | | | + |_| |_| |_|\___| /_/ \_\_|\__, |\___/|_| |_|\__|_| |_|_| |_| |_| + __/ | + |__*/ + override fun sync(featureIds: List, viewId: Int?, onlyEndpoints: List?, arguments: JsonObject?) { + data.arguments = arguments + data.prepare(podlasieLoginMethods, PodlasieFeatures, featureIds, viewId, onlyEndpoints) + Utils.d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}") + Utils.d(TAG, "Endpoint IDs: ${data.targetEndpointIds}") + PodlasieLogin(data) { + PodlasieData(data) { + completed() + } + } + } + + override fun getMessage(message: MessageFull) { + + } + + override fun sendMessage(recipients: List, subject: String, text: String) { + + } + + override fun markAllAnnouncementsAsRead() { + + } + + override fun getAnnouncement(announcement: AnnouncementFull) { + + } + + override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) { + val fileUrl = attachmentName.substringAfter(":") + DownloadAttachment(fileUrl, + onSuccess = { file -> + val event = AttachmentGetEvent( + data.profileId, + owner, + attachmentId, + AttachmentGetEvent.TYPE_FINISHED, + file.absolutePath + ) + + val attachmentDataFile = File(Utils.getStorageDir(), ".${data.profileId}_${event.ownerId}_${event.attachmentId}") + Utils.writeStringToFile(attachmentDataFile, event.fileName) + + EventBus.getDefault().postSticky(event) + + completed() + }, + onProgress = { written, _ -> + val event = AttachmentGetEvent( + data.profileId, + owner, + attachmentId, + AttachmentGetEvent.TYPE_PROGRESS, + bytesWritten = written + ) + + EventBus.getDefault().postSticky(event) + }, + onError = { apiError -> + data.error(apiError) + }) + } + + override fun getRecipientList() { + + } + + override fun getEvent(eventFull: EventFull) { + + } + + override fun firstLogin() { + PodlasieFirstLogin(data) { + completed() + } + } + + override fun cancel() { + Utils.d(TAG, "Cancelled") + data.cancel() + } + + private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback { + return object : EdziennikCallback { + override fun onCompleted() { + callback.onCompleted() + } + + override fun onProgress(step: Float) { + callback.onProgress(step) + } + + override fun onStartProgress(stringRes: Int) { + callback.onStartProgress(stringRes) + } + + override fun onError(apiError: ApiError) { + // TODO Error handling + when (apiError.errorCode) { + in internalErrorList -> { + // finish immediately if the same error occurs twice during the same sync + callback.onError(apiError) + } + else -> callback.onError(apiError) + } + } + + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/PodlasieFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/PodlasieFeatures.kt new file mode 100644 index 00000000..82c6f659 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/PodlasieFeatures.kt @@ -0,0 +1,18 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-12 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie + +import pl.szczodrzynski.edziennik.data.api.FEATURE_ALWAYS_NEEDED +import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_PODLASIE_API +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_PODLASIE +import pl.szczodrzynski.edziennik.data.api.models.Feature + +const val ENDPOINT_PODLASIE_API_MAIN = 1001 + +val PodlasieFeatures = listOf( + Feature(LOGIN_TYPE_PODLASIE, FEATURE_ALWAYS_NEEDED, listOf( + ENDPOINT_PODLASIE_API_MAIN to LOGIN_METHOD_PODLASIE_API + ), listOf(LOGIN_METHOD_PODLASIE_API)) +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/PodlasieApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/PodlasieApi.kt new file mode 100644 index 00000000..985b9899 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/PodlasieApi.kt @@ -0,0 +1,108 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-12 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data + +import com.google.gson.JsonObject +import im.wangchao.mhttp.Request +import im.wangchao.mhttp.RequestParams +import im.wangchao.mhttp.Response +import im.wangchao.mhttp.callback.JsonCallbackHandler +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.getInt +import pl.szczodrzynski.edziennik.getJsonObject +import pl.szczodrzynski.edziennik.toHexString +import pl.szczodrzynski.edziennik.utils.Utils +import java.security.MessageDigest +import java.text.SimpleDateFormat +import java.util.* + +open class PodlasieApi(open val data: DataPodlasie, open val lastSync: Long?) { + companion object { + const val TAG = "PodlasieApi" + } + + val profileId + get() = data.profile?.id ?: -1 + + val profile + get() = data.profile + + fun apiGet(tag: String, endpoint: String, onSuccess: (json: JsonObject) -> Unit) { + val url = PODLASIE_API_URL + endpoint + + Utils.d(tag, "Request: Podlasie/Api - $url") + + if (data.apiToken == null) { + data.error(tag, ERROR_PODLASIE_API_NO_TOKEN) + return + } + + val callback = object : JsonCallbackHandler() { + override fun onSuccess(json: JsonObject?, response: Response?) { + if (json == null || response == null) { + data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) + .withResponse(response)) + return + } + + val error = json.getJsonObject("system_message")?.getInt("code") + + error?.let { code -> + when (code) { + 0 -> ERROR_PODLASIE_API_DATA_MISSING + 4 -> ERROR_LOGIN_PODLASIE_API_DEVICE_LIMIT + 5 -> ERROR_LOGIN_PODLASIE_API_INVALID_TOKEN + 200 -> null // Not an error + else -> ERROR_PODLASIE_API_OTHER + }?.let { errorCode -> + data.error(ApiError(tag, errorCode) + .withApiResponse(json) + .withResponse(response)) + return@onSuccess + } + } + + try { + onSuccess(json) + } catch (e: Exception) { + data.error(ApiError(tag, EXCEPTION_PODLASIE_API_REQUEST) + .withResponse(response) + .withThrowable(e) + .withApiResponse(json)) + } + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + data.error(ApiError(tag, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + } + + Request.builder() + .url(url) + .userAgent(SYSTEM_USER_AGENT) + .requestParams(RequestParams(mapOf( + "token" to data.apiToken, + "securityToken" to getSecurityToken(), + "mobileId" to data.app.deviceId, + "ver" to PODLASIE_API_VERSION + ))) + .callback(callback) + .build() + .enqueue() + } + + private fun getSecurityToken(): String { + val format = SimpleDateFormat("yyyy-MM-dd HH", Locale.ENGLISH) + .also { it.timeZone = TimeZone.getTimeZone("Europe/Warsaw") }.format(System.currentTimeMillis()) + val instance = MessageDigest.getInstance("SHA-256") + val digest = instance.digest("-EYlwYu8u16miVd8tT?oO7cvoUVQrQN0vr!$format".toByteArray()).toHexString() + val digest2 = instance.digest((data.apiToken ?: "").toByteArray()).toHexString() + return instance.digest("$digest$digest2".toByteArray()).toHexString() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/PodlasieData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/PodlasieData.kt new file mode 100644 index 00000000..ce1197b8 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/PodlasieData.kt @@ -0,0 +1,49 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-12 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data + +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.ENDPOINT_PODLASIE_API_MAIN +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api.PodlasieApiMain +import pl.szczodrzynski.edziennik.utils.Utils + +class PodlasieData(val data: DataPodlasie, val onSuccess: () -> Unit) { + companion object { + const val TAG = "PodlasieData" + } + + init { + nextEndpoint(onSuccess) + } + + private fun nextEndpoint(onSuccess: () -> Unit) { + if (data.targetEndpointIds.isEmpty()) { + onSuccess() + return + } + if (data.cancelled) { + onSuccess() + return + } + val id = data.targetEndpointIds.firstKey() + val lastSync = data.targetEndpointIds.remove(id) + useEndpoint(id, lastSync) { + data.progress(data.progressStep) + nextEndpoint(onSuccess) + } + } + + private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) { + Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync") + when (endpointId) { + ENDPOINT_PODLASIE_API_MAIN -> { + data.startProgress(R.string.edziennik_progress_endpoint_data) + PodlasieApiMain(data, lastSync, onSuccess) + } + else -> onSuccess(endpointId) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiEvents.kt new file mode 100644 index 00000000..8a169ee7 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiEvents.kt @@ -0,0 +1,75 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-13 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api + +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.getLong +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time +import java.util.* + +class PodlasieApiEvents(val data: DataPodlasie, val rows: List) { + init { + rows.forEach { event -> + val id = event.getLong("ExternalId") ?: return@forEach + val date = event.getString("DateFrom")?.let { Date.fromY_m_d(it) } ?: return@forEach + val time = event.getString("DateFrom")?.let { Time.fromY_m_d_H_m_s(it) } + ?: return@forEach + + val name = event.getString("Name")?.replace(""", "\"") ?: "" + val description = event.getString("Description")?.replace(""", "\"") ?: "" + + val type = when (event.getString("Category")?.toLowerCase(Locale.getDefault())) { + "klasówka" -> Event.TYPE_EXAM + "praca domowa" -> Event.TYPE_HOMEWORK + "wycieczka" -> Event.TYPE_EXCURSION + else -> Event.TYPE_DEFAULT + } + + val teacherFirstName = event.getString("PersonEnteringDataFirstName") ?: return@forEach + val teacherLastName = event.getString("PersonEnteringDataLastName") ?: return@forEach + val teacher = data.getTeacher(teacherFirstName, teacherLastName) + + val lessonList = data.db.timetableDao().getAllForDateNow(data.profileId, date) + val lesson = lessonList.firstOrNull { it.startTime == time } + + val addedDate = event.getString("CreateDate")?.let { Date.fromIso(it) } + ?: System.currentTimeMillis() + + val eventObject = Event( + profileId = data.profileId, + id = id, + date = date, + time = time, + topic = name, + color = null, + type = type, + teacherId = teacher.id, + subjectId = lesson?.subjectId ?: -1, + teamId = data.teamClass?.id ?: -1, + addedDate = addedDate + ).apply { + homeworkBody = description + } + + data.eventList.add(eventObject) + data.metadataList.add( + Metadata( + data.profileId, + if (type == Event.TYPE_HOMEWORK) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT, + id, + data.profile?.empty ?: false, + data.profile?.empty ?: false + )) + } + + data.toRemove.add(DataRemoveModel.Events.future()) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiFinalGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiFinalGrades.kt new file mode 100644 index 00000000..bb4f696c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiFinalGrades.kt @@ -0,0 +1,121 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-13 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api + +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER1_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_SEMESTER2_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_FINAL +import pl.szczodrzynski.edziennik.data.db.entity.Grade.Companion.TYPE_YEAR_PROPOSED +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.getLong +import pl.szczodrzynski.edziennik.getString + +class PodlasieApiFinalGrades(val data: DataPodlasie, val rows: List) { + init { data.profile?.also { profile -> + rows.forEach { grade -> + val id = grade.getLong("ExternalId") ?: return@forEach + val mark = grade.getString("Mark") ?: return@forEach + val proposedMark = grade.getString("ProposedMark") ?: "0" + val name = data.app.gradesManager.getGradeNumberName(mark) + val value = data.app.gradesManager.getGradeValue(name) + val semester = grade.getString("TermShortcut")?.length ?: return@forEach + + val typeName = grade.getString("Type") ?: return@forEach + val type = when (typeName) { + "S" -> if (semester == 1) TYPE_SEMESTER1_FINAL else TYPE_SEMESTER2_FINAL + "Y", "R" -> TYPE_YEAR_FINAL + else -> return@forEach + } + + val subjectName = grade.getString("SchoolSubject") ?: return@forEach + val subject = data.getSubject(null, subjectName) + + val addedDate = if (profile.empty) profile.getSemesterStart(semester).inMillis + else System.currentTimeMillis() + + val gradeObject = Grade( + profileId = data.profileId, + id = id, + name = name, + type = type, + value = value, + weight = 0f, + color = -1, + category = null, + description = null, + comment = null, + semester = semester, + teacherId = -1, + subjectId = subject.id, + addedDate = addedDate + ) + + data.gradeList.add(gradeObject) + data.metadataList.add( + Metadata( + data.profileId, + Metadata.TYPE_GRADE, + id, + profile.empty, + profile.empty + )) + + if (proposedMark != "0") { + val proposedName = data.app.gradesManager.getGradeNumberName(proposedMark) + val proposedValue = data.app.gradesManager.getGradeValue(proposedName) + + val proposedType = when (typeName) { + "S" -> if (semester == 1) TYPE_SEMESTER1_PROPOSED else TYPE_SEMESTER2_PROPOSED + "Y", "R" -> TYPE_YEAR_PROPOSED + else -> return@forEach + } + + val proposedGradeObject = Grade( + profileId = data.profileId, + id = id * (-1), + name = proposedName, + type = proposedType, + value = proposedValue, + weight = 0f, + color = -1, + category = null, + description = null, + comment = null, + semester = semester, + teacherId = -1, + subjectId = subject.id, + addedDate = addedDate + ) + + data.gradeList.add(proposedGradeObject) + data.metadataList.add( + Metadata( + data.profileId, + Metadata.TYPE_GRADE, + proposedGradeObject.id, + profile.empty, + profile.empty + )) + } + } + + data.toRemove.addAll(listOf( + TYPE_SEMESTER1_FINAL, + TYPE_SEMESTER1_PROPOSED, + TYPE_SEMESTER2_FINAL, + TYPE_SEMESTER2_PROPOSED, + TYPE_YEAR_FINAL, + TYPE_YEAR_PROPOSED + ).map { + DataRemoveModel.Grades.allWithType(it) + }) + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiGrades.kt new file mode 100644 index 00000000..c3946c76 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiGrades.kt @@ -0,0 +1,72 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-13 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api + +import android.graphics.Color +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.getFloat +import pl.szczodrzynski.edziennik.getInt +import pl.szczodrzynski.edziennik.getLong +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.utils.models.Date + +class PodlasieApiGrades(val data: DataPodlasie, val rows: List) { + init { + rows.forEach { grade -> + val id = grade.getLong("ExternalId") ?: return@forEach + val name = grade.getString("Mark") ?: return@forEach + val value = data.app.gradesManager.getGradeValue(name) + val weight = grade.getFloat("Weight") ?: 0f + val includeToAverage = grade.getInt("IncludeToAverage") != 0 + val color = grade.getString("Color")?.let { Color.parseColor(it) } ?: -1 + val category = grade.getString("Category") ?: "" + val comment = grade.getString("Comment") ?: "" + val semester = grade.getString("TermShortcut")?.length ?: data.currentSemester + + val teacherFirstName = grade.getString("TeacherFirstName") ?: return@forEach + val teacherLastName = grade.getString("TeacherLastName") ?: return@forEach + val teacher = data.getTeacher(teacherFirstName, teacherLastName) + + val subjectName = grade.getString("SchoolSubject") ?: return@forEach + val subject = data.getSubject(null, subjectName) + + val addedDate = grade.getString("ReceivedDate")?.let { Date.fromY_m_d(it).inMillis } + ?: System.currentTimeMillis() + + val gradeObject = Grade( + profileId = data.profileId, + id = id, + name = name, + type = Grade.TYPE_NORMAL, + value = value, + weight = if (includeToAverage) weight else 0f, + color = color, + category = category, + description = null, + comment = comment, + semester = semester, + teacherId = teacher.id, + subjectId = subject.id, + addedDate = addedDate + ) + + data.gradeList.add(gradeObject) + data.metadataList.add( + Metadata( + data.profileId, + Metadata.TYPE_GRADE, + id, + data.profile?.empty ?: false, + data.profile?.empty ?: false + )) + } + + data.toRemove.add(DataRemoveModel.Grades.allWithType(Grade.TYPE_NORMAL)) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiHomework.kt new file mode 100644 index 00000000..6ab53328 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiHomework.kt @@ -0,0 +1,64 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-14 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api + +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.crc32 +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.get +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.utils.models.Date + +class PodlasieApiHomework(val data: DataPodlasie, val rows: List) { + init { + rows.reversed().forEach { homework -> + val id = homework.getString("ExternalId")?.crc32() ?: return@forEach + val topic = homework.getString("Title")?.replace(""", "\"") ?: "" + val description = homework.getString("Message")?.replace(""", "\"") ?: "" + val date = Date.getToday() + val addedDate = System.currentTimeMillis() + + val eventObject = Event( + profileId = data.profileId, + id = id, + date = date, + time = null, + topic = topic, + color = null, + type = Event.TYPE_HOMEWORK, + teacherId = -1, + subjectId = -1, + teamId = data.teamClass?.id ?: -1, + addedDate = addedDate + ).apply { + homeworkBody = description + } + + eventObject.attachmentIds = mutableListOf() + eventObject.attachmentNames = mutableListOf() + homework.getString("Attachments")?.split(',')?.onEach { url -> + val filename = "&filename=(.*?)&".toRegex().find(url)?.get(1) ?: return@onEach + val ext = "&ext=(.*?)&".toRegex().find(url)?.get(1) ?: return@onEach + eventObject.attachmentIds?.add(url.crc32()) + eventObject.attachmentNames?.add("$filename.$ext:$url") + } + + data.eventList.add(eventObject) + data.metadataList.add( + Metadata( + data.profileId, + Metadata.TYPE_HOMEWORK, + id, + data.profile?.empty ?: false, + data.profile?.empty ?: false + )) + } + + data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK)) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiLuckyNumber.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiLuckyNumber.kt new file mode 100644 index 00000000..725ec727 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiLuckyNumber.kt @@ -0,0 +1,30 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-13 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api + +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.utils.models.Date + +class PodlasieApiLuckyNumber(val data: DataPodlasie, val luckyNumber: Int) { + init { + val luckyNumberObject = LuckyNumber( + profileId = data.profileId, + date = Date.getToday(), + number = luckyNumber + ) + + data.luckyNumberList.add(luckyNumberObject) + data.metadataList.add( + Metadata( + data.profileId, + Metadata.TYPE_LUCKY_NUMBER, + luckyNumberObject.date.value.toLong(), + true, + data.profile?.empty ?: false + )) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiMain.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiMain.kt new file mode 100644 index 00000000..f108d35e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiMain.kt @@ -0,0 +1,45 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-12 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api + +import pl.szczodrzynski.edziennik.asJsonObjectList +import pl.szczodrzynski.edziennik.data.api.PODLASIE_API_USER_ENDPOINT +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.ENDPOINT_PODLASIE_API_MAIN +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.PodlasieApi +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.getInt +import pl.szczodrzynski.edziennik.getJsonArray + +class PodlasieApiMain(override val data: DataPodlasie, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit) : PodlasieApi(data, lastSync) { + companion object { + const val TAG = "PodlasieApiTimetable" + } + + init { + apiGet(TAG, PODLASIE_API_USER_ENDPOINT) { json -> + // Save the class team when it doesn't exist. + data.getTeam( + id = null, + name = data.className ?: "", + schoolCode = data.schoolShortName ?: "", + isTeamClass = true + ) + + json.getInt("LuckyNumber")?.let { PodlasieApiLuckyNumber(data, it) } + json.getJsonArray("Teacher")?.asJsonObjectList()?.let { PodlasieApiTeachers(data, it) } + json.getJsonArray("Timetable")?.asJsonObjectList()?.let { PodlasieApiTimetable(data, it) } + json.getJsonArray("Marks")?.asJsonObjectList()?.let { PodlasieApiGrades(data, it) } + json.getJsonArray("MarkFinal")?.asJsonObjectList()?.let { PodlasieApiFinalGrades(data, it) } + json.getJsonArray("News")?.asJsonObjectList()?.let { PodlasieApiEvents(data, it) } + json.getJsonArray("Tasks")?.asJsonObjectList()?.let { PodlasieApiHomework(data, it) } + + data.setSyncNext(ENDPOINT_PODLASIE_API_MAIN, SYNC_ALWAYS) + onSuccess(ENDPOINT_PODLASIE_API_MAIN) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiTeachers.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiTeachers.kt new file mode 100644 index 00000000..ca1fa7b4 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiTeachers.kt @@ -0,0 +1,40 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-13 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api + +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.getInt +import pl.szczodrzynski.edziennik.getLong +import pl.szczodrzynski.edziennik.getString + +class PodlasieApiTeachers(val data: DataPodlasie, val rows: List) { + init { + rows.forEach { teacher -> + val id = teacher.getLong("ExternalId") ?: return@forEach + val firstName = teacher.getString("FirstName") ?: return@forEach + val lastName = teacher.getString("LastName") ?: return@forEach + val isEducator = teacher.getInt("Educator") == 1 + + val teacherObject = Teacher( + profileId = data.profileId, + id = id, + name = firstName, + surname = lastName, + loginId = null + ) + + data.teacherList.put(id, teacherObject) + + val teamClass = data.teamClass + if (isEducator && teamClass != null) { + data.teamList.put(teamClass.id, teamClass.apply { + teacherId = id + }) + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiTimetable.kt new file mode 100644 index 00000000..13cff861 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/data/api/PodlasieApiTimetable.kt @@ -0,0 +1,96 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-12 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.api + +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Lesson +import pl.szczodrzynski.edziennik.getInt +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time +import pl.szczodrzynski.edziennik.utils.models.Week + +class PodlasieApiTimetable(val data: DataPodlasie, rows: List) { + init { + val currentWeekStart = Week.getWeekStart() + + if (Date.getToday().weekDay > 4) { + currentWeekStart.stepForward(0, 0, 7) + } + + val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d + + val weekStart = Date.fromY_m_d(getDate) + val weekEnd = weekStart.clone().stepForward(0, 0, 6) + + val days = mutableListOf() + var startDate: Date? = null + var endDate: Date? = null + + rows.forEach { lesson -> + val date = lesson.getString("Date")?.let { Date.fromY_m_d(it) } ?: return@forEach + + if ((date > weekEnd || date < weekStart) && data.profile?.empty != true) return@forEach + if (startDate == null) startDate = date.clone() + endDate = date.clone() + if (date.value !in days) days += date.value + + val lessonNumber = lesson.getInt("LessonNumber") ?: return@forEach + val startTime = lesson.getString("TimeFrom")?.let { Time.fromH_m_s(it) } + ?: return@forEach + val endTime = lesson.getString("TimeTo")?.let { Time.fromH_m_s(it) } ?: return@forEach + val subject = lesson.getString("SchoolSubject")?.let { data.getSubject(null, it) } + ?: return@forEach + + val teacherFirstName = lesson.getString("TeacherFirstName") ?: return@forEach + val teacherLastName = lesson.getString("TeacherLastName") ?: return@forEach + val teacher = data.getTeacher(teacherFirstName, teacherLastName) + + val team = lesson.getString("Group")?.let { + data.getTeam( + id = null, + name = it, + schoolCode = data.schoolShortName ?: "", + isTeamClass = it == "cała klasa" + ) + } ?: return@forEach + val classroom = lesson.getString("Room") + + Lesson(data.profileId, -1).also { + it.type = Lesson.TYPE_NORMAL + it.date = date + it.lessonNumber = lessonNumber + it.startTime = startTime + it.endTime = endTime + it.subjectId = subject.id + it.teacherId = teacher.id + it.teamId = team.id + it.classroom = classroom + + it.id = it.buildId() + data.lessonList += it + } + } + + if (startDate != null && endDate != null) { + if (weekEnd > endDate!!) endDate = weekEnd + + while (startDate!! <= endDate!!) { + if (startDate!!.value !in days) { + val lessonDate = startDate!!.clone() + data.lessonList += Lesson(data.profileId, lessonDate.value.toLong()).apply { + type = Lesson.TYPE_NO_LESSONS + date = lessonDate + } + } + startDate!!.stepForward(0, 0, 1) + } + } + + data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd)) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/firstlogin/PodlasieFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/firstlogin/PodlasieFirstLogin.kt new file mode 100644 index 00000000..a1e9d0eb --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/firstlogin/PodlasieFirstLogin.kt @@ -0,0 +1,84 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-12 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.firstlogin + +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_PODLASIE +import pl.szczodrzynski.edziennik.data.api.PODLASIE_API_LOGOUT_DEVICES_ENDPOINT +import pl.szczodrzynski.edziennik.data.api.PODLASIE_API_USER_ENDPOINT +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.data.PodlasieApi +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login.PodlasieLoginApi +import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent +import pl.szczodrzynski.edziennik.data.db.entity.Profile + +class PodlasieFirstLogin(val data: DataPodlasie, val onSuccess: () -> Unit) { + companion object { + const val TAG = "PodlasieFirstLogin" + } + + private val api = PodlasieApi(data, null) + + init { + PodlasieLoginApi(data) { + doLogin() + } + } + + private fun doLogin() { + val loginStoreId = data.loginStore.id + val loginStoreType = LOGIN_TYPE_PODLASIE + + if (data.loginStore.getLoginData("logoutDevices", false)) { + data.loginStore.removeLoginData("logoutDevices") + api.apiGet(TAG, PODLASIE_API_LOGOUT_DEVICES_ENDPOINT) { + doLogin() + } + return + } + + api.apiGet(TAG, PODLASIE_API_USER_ENDPOINT) { json -> + val uuid = json.getString("Uuid") + val login = json.getString("Login") + val firstName = json.getString("FirstName") + val lastName = json.getString("LastName") + val studentNameLong = "$firstName $lastName".fixName() + val studentNameShort = studentNameLong.getShortName() + val schoolName = json.getString("SchoolName") + val className = json.getString("SchoolClass") + val schoolYear = json.getString("ActualSchoolYear")?.replace(' ', '/') + val semester = json.getString("ActualTermShortcut")?.length + val apiUrl = json.getString("URL") + + val profile = Profile( + loginStoreId, + loginStoreId, + loginStoreType, + studentNameLong, + login, + studentNameLong, + studentNameShort, + null + ).apply { + studentData["studentId"] = uuid + studentData["studentLogin"] = login + studentData["schoolName"] = schoolName + studentData["className"] = className + studentData["schoolYear"] = schoolYear + studentData["currentSemester"] = semester ?: 1 + studentData["apiUrl"] = apiUrl + + schoolYear?.split('/')?.get(0)?.toInt()?.let { + studentSchoolYearStart = it + } + studentClassName = className + } + + EventBus.getDefault().postSticky(FirstLoginFinishedEvent(listOf(profile), data.loginStore)) + onSuccess() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/login/PodlasieLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/login/PodlasieLogin.kt new file mode 100644 index 00000000..406bb997 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/login/PodlasieLogin.kt @@ -0,0 +1,54 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-12 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login + +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_PODLASIE_API +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.utils.Utils + +class PodlasieLogin(val data: DataPodlasie, val onSuccess: () -> Unit) { + companion object { + const val TAG = "PodlasieLogin" + } + + private var cancelled = false + + init { + nextLoginMethod(onSuccess) + } + + private fun nextLoginMethod(onSuccess: () -> Unit) { + if (data.targetLoginMethodIds.isEmpty()) { + onSuccess() + return + } + if (cancelled) { + onSuccess() + return + } + useLoginMethod(data.targetLoginMethodIds.removeAt(0)) { usedMethodId -> + data.progress(data.progressStep) + if (usedMethodId != -1) + data.loginMethods.add(usedMethodId) + nextLoginMethod(onSuccess) + } + } + + private fun useLoginMethod(loginMethodId: Int, onSuccess: (usedMethodId: Int) -> Unit) { + // this should never be true + if (data.loginMethods.contains(loginMethodId)) { + onSuccess(-1) + return + } + Utils.d(TAG, "Using login method $loginMethodId") + when (loginMethodId) { + LOGIN_METHOD_PODLASIE_API -> { + data.startProgress(R.string.edziennik_progress_login_podlasie_api) + PodlasieLoginApi(data) { onSuccess(loginMethodId) } + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/login/PodlasieLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/login/PodlasieLoginApi.kt new file mode 100644 index 00000000..6eb70d06 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/podlasie/login/PodlasieLoginApi.kt @@ -0,0 +1,23 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-5-12 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.login + +import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_DATA_MISSING +import pl.szczodrzynski.edziennik.data.api.edziennik.podlasie.DataPodlasie +import pl.szczodrzynski.edziennik.data.api.models.ApiError + +class PodlasieLoginApi(val data: DataPodlasie, val onSuccess: () -> Unit) { + companion object { + const val TAG = "PodlasieLoginApi" + } + + init { run { + if (data.isApiLoginValid()) { + onSuccess() + } else { + data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING)) + } + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/DataTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/DataTemplate.kt index 86616983..dcf569cf 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/DataTemplate.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/DataTemplate.kt @@ -4,14 +4,13 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.template -import okhttp3.Cookie import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.currentTimeUnix import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_TEMPLATE_API import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_TEMPLATE_WEB import pl.szczodrzynski.edziennik.data.api.models.Data -import pl.szczodrzynski.edziennik.currentTimeUnix -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile import pl.szczodrzynski.edziennik.isNotNullNorEmpty /** @@ -28,18 +27,14 @@ class DataTemplate(app: App, profile: Profile?, loginStore: LoginStore) : Data(a loginMethods.clear() if (isWebLoginValid()) { loginMethods += LOGIN_METHOD_TEMPLATE_WEB - app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name("AuthCookie") - .value(webCookie!!) - .domain("eregister.example.com") - .secure().httpOnly().build() - )) + app.cookieJar.set("eregister.example.com", "AuthCookie", webCookie) } if (isApiLoginValid()) loginMethods += LOGIN_METHOD_TEMPLATE_API } + override fun generateUserCode() = "TEMPLATE:DO_NOT_USE" + /* __ __ _ \ \ / / | | \ \ /\ / /__| |__ diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/Template.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/Template.kt index e850b741..843d36e9 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/Template.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/Template.kt @@ -15,10 +15,12 @@ import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface import pl.szczodrzynski.edziennik.data.api.models.ApiError import pl.szczodrzynski.edziennik.data.api.prepare import pl.szczodrzynski.edziennik.data.api.templateLoginMethods -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.data.db.full.MessageFull import pl.szczodrzynski.edziennik.utils.Utils.d class Template(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface { @@ -38,9 +40,7 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore, private fun completed() { data.saveData() - data.notify { - callback.onCompleted() - } + callback.onCompleted() } /* _______ _ _ _ _ _ @@ -51,9 +51,9 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore, |_| |_| |_|\___| /_/ \_\_|\__, |\___/|_| |_|\__|_| |_|_| |_| |_| __/ | |__*/ - override fun sync(featureIds: List, viewId: Int?, arguments: JsonObject?) { + override fun sync(featureIds: List, viewId: Int?, onlyEndpoints: List?, arguments: JsonObject?) { data.arguments = arguments - data.prepare(templateLoginMethods, TemplateFeatures, featureIds, viewId) + data.prepare(templateLoginMethods, TemplateFeatures, featureIds, viewId, onlyEndpoints) d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}") d(TAG, "Endpoint IDs: ${data.targetEndpointIds}") TemplateLogin(data) { @@ -67,11 +67,27 @@ class Template(val app: App, val profile: Profile?, val loginStore: LoginStore, } + override fun sendMessage(recipients: List, subject: String, text: String) { + + } + override fun markAllAnnouncementsAsRead() { } - override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) { + override fun getAnnouncement(announcement: AnnouncementFull) { + + } + + override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) { + + } + + override fun getRecipientList() { + + } + + override fun getEvent(eventFull: EventFull) { } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateApi.kt index e36a8e6d..d3d4c607 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateApi.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateApi.kt @@ -5,13 +5,13 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.template.data import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.currentTimeUnix import pl.szczodrzynski.edziennik.data.api.ERROR_TEMPLATE_WEB_OTHER import pl.szczodrzynski.edziennik.data.api.GET import pl.szczodrzynski.edziennik.data.api.edziennik.template.DataTemplate import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.currentTimeUnix -open class TemplateApi(open val data: DataTemplate) { +open class TemplateApi(open val data: DataTemplate, open val lastSync: Long?) { companion object { private const val TAG = "TemplateApi" } @@ -34,7 +34,7 @@ open class TemplateApi(open val data: DataTemplate) { json.addProperty("sample", "text") if (currentTimeUnix() % 4L == 0L) { - // let's set a 20% chance of error, just as a test + // let's set a 25% chance of error, just as a test data.error(ApiError(tag, ERROR_TEMPLATE_WEB_OTHER) .withApiResponse("404 Not Found - this is the text returned by the API")) return diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateData.kt index d0833c02..3489555f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateData.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateData.kt @@ -32,28 +32,30 @@ class TemplateData(val data: DataTemplate, val onSuccess: () -> Unit) { onSuccess() return } - useEndpoint(data.targetEndpointIds.removeAt(0)) { + val id = data.targetEndpointIds.firstKey() + val lastSync = data.targetEndpointIds.remove(id) + useEndpoint(id, lastSync) { endpointId -> data.progress(data.progressStep) nextEndpoint(onSuccess) } } - private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) { - Utils.d(TAG, "Using endpoint $endpointId") + private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) { + Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync") when (endpointId) { ENDPOINT_TEMPLATE_WEB_SAMPLE -> { data.startProgress(R.string.edziennik_progress_endpoint_student_info) - TemplateWebSample(data) { onSuccess() } + TemplateWebSample(data, lastSync, onSuccess) } ENDPOINT_TEMPLATE_WEB_SAMPLE_2 -> { data.startProgress(R.string.edziennik_progress_endpoint_school_info) - TemplateWebSample2(data) { onSuccess() } + TemplateWebSample2(data, lastSync, onSuccess) } ENDPOINT_TEMPLATE_API_SAMPLE -> { data.startProgress(R.string.edziennik_progress_endpoint_grades) - TemplateApiSample(data) { onSuccess() } + TemplateApiSample(data, lastSync, onSuccess) } - else -> onSuccess() + else -> onSuccess(endpointId) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateWeb.kt index eabe71a6..0db508c7 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateWeb.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/TemplateWeb.kt @@ -5,13 +5,13 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.template.data import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.currentTimeUnix import pl.szczodrzynski.edziennik.data.api.ERROR_TEMPLATE_WEB_OTHER import pl.szczodrzynski.edziennik.data.api.GET import pl.szczodrzynski.edziennik.data.api.edziennik.template.DataTemplate import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.currentTimeUnix -open class TemplateWeb(open val data: DataTemplate) { +open class TemplateWeb(open val data: DataTemplate, open val lastSync: Long?) { companion object { private const val TAG = "TemplateWeb" } @@ -34,7 +34,7 @@ open class TemplateWeb(open val data: DataTemplate) { json.addProperty("sample", "text") if (currentTimeUnix() % 4L == 0L) { - // let's set a 20% chance of error, just as a test + // let's set a 25% chance of error, just as a test data.error(ApiError(tag, ERROR_TEMPLATE_WEB_OTHER) .withApiResponse("404 Not Found - this is the text returned by the API")) return diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/api/TemplateApiSample.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/api/TemplateApiSample.kt index e8f0a326..632a8e74 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/api/TemplateApiSample.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/api/TemplateApiSample.kt @@ -9,10 +9,12 @@ import pl.szczodrzynski.edziennik.MainActivity import pl.szczodrzynski.edziennik.data.api.edziennik.template.DataTemplate import pl.szczodrzynski.edziennik.data.api.edziennik.template.ENDPOINT_TEMPLATE_API_SAMPLE import pl.szczodrzynski.edziennik.data.api.edziennik.template.data.TemplateApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS class TemplateApiSample(override val data: DataTemplate, - val onSuccess: () -> Unit) : TemplateApi(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : TemplateApi(data, lastSync) { companion object { private const val TAG = "TemplateApiSample" } @@ -33,7 +35,7 @@ class TemplateApiSample(override val data: DataTemplate, // always, in every sync data.setSyncNext(ENDPOINT_TEMPLATE_API_SAMPLE, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_TEMPLATE_API_SAMPLE) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/web/TemplateWebSample.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/web/TemplateWebSample.kt index 5efca695..f0ba882e 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/web/TemplateWebSample.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/web/TemplateWebSample.kt @@ -10,10 +10,12 @@ import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOME import pl.szczodrzynski.edziennik.data.api.edziennik.template.DataTemplate import pl.szczodrzynski.edziennik.data.api.edziennik.template.ENDPOINT_TEMPLATE_WEB_SAMPLE import pl.szczodrzynski.edziennik.data.api.edziennik.template.data.TemplateWeb -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS class TemplateWebSample(override val data: DataTemplate, - val onSuccess: () -> Unit) : TemplateWeb(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : TemplateWeb(data, lastSync) { companion object { private const val TAG = "TemplateWebSample" } @@ -34,7 +36,7 @@ class TemplateWebSample(override val data: DataTemplate, // always, in every sync data.setSyncNext(ENDPOINT_TEMPLATE_WEB_SAMPLE, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_TEMPLATE_WEB_SAMPLE) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/web/TemplateWebSample2.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/web/TemplateWebSample2.kt index af12c16e..02d58231 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/web/TemplateWebSample2.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/data/web/TemplateWebSample2.kt @@ -9,10 +9,12 @@ import pl.szczodrzynski.edziennik.MainActivity import pl.szczodrzynski.edziennik.data.api.edziennik.template.DataTemplate import pl.szczodrzynski.edziennik.data.api.edziennik.template.ENDPOINT_TEMPLATE_WEB_SAMPLE_2 import pl.szczodrzynski.edziennik.data.api.edziennik.template.data.TemplateWeb -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS class TemplateWebSample2(override val data: DataTemplate, - val onSuccess: () -> Unit) : TemplateWeb(data) { + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : TemplateWeb(data, lastSync) { companion object { private const val TAG = "TemplateWebSample2" } @@ -33,7 +35,7 @@ class TemplateWebSample2(override val data: DataTemplate, // always, in every sync data.setSyncNext(ENDPOINT_TEMPLATE_WEB_SAMPLE_2, SYNC_ALWAYS) - onSuccess() + onSuccess(ENDPOINT_TEMPLATE_WEB_SAMPLE_2) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/firstlogin/TemplateFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/firstlogin/TemplateFirstLogin.kt index 54654f08..48cc6f18 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/firstlogin/TemplateFirstLogin.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/firstlogin/TemplateFirstLogin.kt @@ -7,15 +7,15 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.template.firstlogin import pl.szczodrzynski.edziennik.data.api.edziennik.template.DataTemplate import pl.szczodrzynski.edziennik.data.api.edziennik.template.data.TemplateApi import pl.szczodrzynski.edziennik.data.api.edziennik.template.data.TemplateWeb -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Profile class TemplateFirstLogin(val data: DataTemplate, val onSuccess: () -> Unit) { companion object { private const val TAG = "TemplateFirstLogin" } - private val web = TemplateWeb(data) - private val api = TemplateApi(data) + private val web = TemplateWeb(data, null) + private val api = TemplateApi(data, null) private val profileList = mutableListOf() init { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/login/TemplateLoginWeb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/login/TemplateLoginWeb.kt index fac39d50..d7a24ef0 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/login/TemplateLoginWeb.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/template/login/TemplateLoginWeb.kt @@ -4,12 +4,11 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.template.login -import okhttp3.Cookie +import pl.szczodrzynski.edziennik.currentTimeUnix import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_DATA_MISSING import pl.szczodrzynski.edziennik.data.api.ERROR_PROFILE_MISSING import pl.szczodrzynski.edziennik.data.api.edziennik.template.DataTemplate import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.currentTimeUnix class TemplateLoginWeb(val data: DataTemplate, val onSuccess: () -> Unit) { companion object { @@ -23,17 +22,11 @@ class TemplateLoginWeb(val data: DataTemplate, val onSuccess: () -> Unit) { } if (data.isWebLoginValid()) { - data.app.cookieJar.saveFromResponse(null, listOf( - Cookie.Builder() - .name("AuthCookie") - .value(data.webCookie!!) - .domain("eregister.example.com") - .secure().httpOnly().build() - )) + data.app.cookieJar.set("eregister.example.com", "AuthCookie", data.webCookie) onSuccess() } else { - data.app.cookieJar.clearForDomain("eregister.example.com") + data.app.cookieJar.clear("eregister.example.com") if (/*data.webLogin != null && data.webPassword != null && */true) { loginWithCredentials() } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt index c1d5f1fb..e3516ad4 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/DataVulcan.kt @@ -4,25 +4,48 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan +import com.google.gson.JsonObject import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API +import pl.szczodrzynski.edziennik.crc16 +import pl.szczodrzynski.edziennik.currentTimeUnix +import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_HEBE +import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_WEB_MAIN import pl.szczodrzynski.edziennik.data.api.models.Data -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile import pl.szczodrzynski.edziennik.isNotNullNorEmpty +import pl.szczodrzynski.fslogin.realm.RealmData class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app, profile, loginStore) { - - fun isApiLoginValid() = /*apiCertificateExpiryTime-30 > currentTimeUnix() - &&*/ apiCertificateKey.isNotNullNorEmpty() - && apiCertificatePrivate.isNotNullNorEmpty() + fun isWebMainLoginValid() = symbol.isNotNullNorEmpty() + && (webExpiryTime[symbol]?.toLongOrNull() ?: 0) - 30 > currentTimeUnix() + && webAuthCookie[symbol].isNotNullNorEmpty() + && webRealmData != null + fun isHebeLoginValid() = hebePublicKey.isNotNullNorEmpty() + && hebePrivateKey.isNotNullNorEmpty() && symbol.isNotNullNorEmpty() override fun satisfyLoginMethods() { loginMethods.clear() - if (isApiLoginValid()) { - loginMethods += LOGIN_METHOD_VULCAN_API + if (isWebMainLoginValid()) { + loginMethods += LOGIN_METHOD_VULCAN_WEB_MAIN } + if (isHebeLoginValid()) { + loginMethods += LOGIN_METHOD_VULCAN_HEBE + } + } + + override fun generateUserCode() = "$schoolCode:$studentId" + + fun buildDeviceId(): String { + val deviceId = app.deviceId.padStart(16, '0') + val loginStoreId = loginStore.id.toString(16).padStart(4, '0') + val symbol = symbol?.crc16()?.toString(16)?.take(2) ?: "00" + return deviceId.substring(0..7) + + "-" + deviceId.substring(8..11) + + "-" + deviceId.substring(12..15) + + "-" + loginStoreId + + "-" + symbol + "6f72616e7a" } /** @@ -34,8 +57,8 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app */ private var mSymbol: String? = null var symbol: String? - get() { mSymbol = mSymbol ?: loginStore.getLoginData("deviceSymbol", null); return mSymbol } - set(value) { loginStore.putLoginData("deviceSymbol", value); mSymbol = value } + get() { mSymbol = mSymbol ?: profile?.getStudentData("symbol", null); return mSymbol } + set(value) { profile?.putStudentData("symbol", value); mSymbol = value } /** * Group symbol/number of the student's school. @@ -50,16 +73,26 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app set(value) { profile?.putStudentData("schoolSymbol", value) ?: return; mSchoolSymbol = value } /** - * A school ID consisting of the [symbol] and [schoolSymbol]. + * Short name of the school, used in some places. + * + * ListaUczniow/JednostkaSprawozdawczaSkrot, e.g. "SP Wilkow" + */ + private var mSchoolShort: String? = null + var schoolShort: String? + get() { mSchoolShort = mSchoolShort ?: profile?.getStudentData("schoolShort", null); return mSchoolShort } + set(value) { profile?.putStudentData("schoolShort", value) ?: return; mSchoolShort = value } + + /** + * A school code consisting of the [symbol] and [schoolSymbol]. * * [symbol]_[schoolSymbol] * * e.g. "poznan_000088" */ - private var mSchoolName: String? = null - var schoolName: String? - get() { mSchoolName = mSchoolName ?: profile?.getStudentData("schoolName", null); return mSchoolName } - set(value) { profile?.putStudentData("schoolName", value) ?: return; mSchoolName = value } + private var mSchoolCode: String? = null + var schoolCode: String? + get() { mSchoolCode = mSchoolCode ?: profile?.getStudentData("schoolName", null); return mSchoolCode } + set(value) { profile?.putStudentData("schoolName", value) ?: return; mSchoolCode = value } /** * ID of the student. @@ -99,6 +132,25 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app get() { mStudentSemesterId = mStudentSemesterId ?: profile?.getStudentData("studentSemesterId", 0); return mStudentSemesterId ?: 0 } set(value) { profile?.putStudentData("studentSemesterId", value) ?: return; mStudentSemesterId = value } + private var mStudentUnitId: Int? = null + var studentUnitId: Int + get() { mStudentUnitId = mStudentUnitId ?: profile?.getStudentData("studentUnitId", 0); return mStudentUnitId ?: 0 } + set(value) { profile?.putStudentData("studentUnitId", value) ?: return; mStudentUnitId = value } + + private var mStudentConstituentId: Int? = null + var studentConstituentId: Int + get() { mStudentConstituentId = mStudentConstituentId ?: profile?.getStudentData("studentConstituentId", 0); return mStudentConstituentId ?: 0 } + set(value) { profile?.putStudentData("studentConstituentId", value) ?: return; mStudentConstituentId = value } + + private var mSemester1Id: Int? = null + var semester1Id: Int + get() { mSemester1Id = mSemester1Id ?: profile?.getStudentData("semester1Id", 0); return mSemester1Id ?: 0 } + set(value) { profile?.putStudentData("semester1Id", value) ?: return; mSemester1Id = value } + private var mSemester2Id: Int? = null + var semester2Id: Int + get() { mSemester2Id = mSemester2Id ?: profile?.getStudentData("semester2Id", 0); return mSemester2Id ?: 0 } + set(value) { profile?.putStudentData("semester2Id", value) ?: return; mSemester2Id = value } + /** * ListaUczniow/OkresNumer, e.g. 1 or 2 */ @@ -107,6 +159,16 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app get() { mStudentSemesterNumber = mStudentSemesterNumber ?: profile?.getStudentData("studentSemesterNumber", 0); return mStudentSemesterNumber ?: 0 } set(value) { profile?.putStudentData("studentSemesterNumber", value) ?: return; mStudentSemesterNumber = value } + /** + * Date of the end of the current semester ([studentSemesterNumber]). + * + * After this date, an API refresh of student list is required. + */ + private var mCurrentSemesterEndDate: Long? = null + var currentSemesterEndDate: Long + get() { mCurrentSemesterEndDate = mCurrentSemesterEndDate ?: profile?.getStudentData("currentSemesterEndDate", 0L); return mCurrentSemesterEndDate ?: 0L } + set(value) { profile?.putStudentData("currentSemesterEndDate", value) ?: return; mCurrentSemesterEndDate = value } + /* _____ _____ ____ /\ | __ \_ _| |___ \ / \ | |__) || | __ ____) | @@ -119,44 +181,60 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app * After first login only 3 first characters are stored here. * This is later used to determine the API URL address. */ - private var mApiToken: String? = null - var apiToken: String? - get() { mApiToken = mApiToken ?: loginStore.getLoginData("deviceToken", null); return mApiToken } - set(value) { loginStore.putLoginData("deviceToken", value); mApiToken = value } + private var mApiToken: Map? = null + var apiToken: Map = mapOf() + get() { mApiToken = mApiToken ?: loginStore.getLoginData("apiToken", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiToken ?: mapOf() } + set(value) { loginStore.putLoginData("apiToken", app.gson.toJson(value)); mApiToken = value } /** * A mobile API registration PIN. * * After first login, this is removed and/or set to null. */ - private var mApiPin: String? = null - var apiPin: String? - get() { mApiPin = mApiPin ?: loginStore.getLoginData("devicePin", null); return mApiPin } - set(value) { loginStore.putLoginData("devicePin", value); mApiPin = value } + private var mApiPin: Map? = null + var apiPin: Map = mapOf() + get() { mApiPin = mApiPin ?: loginStore.getLoginData("apiPin", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mApiPin ?: mapOf() } + set(value) { loginStore.putLoginData("apiPin", app.gson.toJson(value)); mApiPin = value } - private var mApiCertificateKey: String? = null - var apiCertificateKey: String? - get() { mApiCertificateKey = mApiCertificateKey ?: loginStore.getLoginData("certificateKey", null); return mApiCertificateKey } - set(value) { loginStore.putLoginData("certificateKey", value); mApiCertificateKey = value } + /* _ _ _ _____ _____ + | | | | | | /\ | __ \_ _| + | |__| | ___| |__ ___ / \ | |__) || | + | __ |/ _ \ '_ \ / _ \ / /\ \ | ___/ | | + | | | | __/ |_) | __/ / ____ \| | _| |_ + |_| |_|\___|_.__/ \___| /_/ \_\_| |____*/ + private var mHebePublicKey: String? = null + var hebePublicKey: String? + get() { mHebePublicKey = mHebePublicKey ?: loginStore.getLoginData("hebePublicKey", null); return mHebePublicKey } + set(value) { loginStore.putLoginData("hebePublicKey", value); mHebePublicKey = value } - private var mApiCertificatePfx: String? = null - var apiCertificatePfx: String? - get() { mApiCertificatePfx = mApiCertificatePfx ?: loginStore.getLoginData("certificatePfx", null); return mApiCertificatePfx } - set(value) { loginStore.putLoginData("certificatePfx", value); mApiCertificatePfx = value } + private var mHebePrivateKey: String? = null + var hebePrivateKey: String? + get() { mHebePrivateKey = mHebePrivateKey ?: loginStore.getLoginData("hebePrivateKey", null); return mHebePrivateKey } + set(value) { loginStore.putLoginData("hebePrivateKey", value); mHebePrivateKey = value } - private var mApiCertificatePrivate: String? = null - var apiCertificatePrivate: String? - get() { mApiCertificatePrivate = mApiCertificatePrivate ?: loginStore.getLoginData("certificatePrivate", null); return mApiCertificatePrivate } - set(value) { loginStore.putLoginData("certificatePrivate", value); mApiCertificatePrivate = value } + private var mHebePublicHash: String? = null + var hebePublicHash: String? + get() { mHebePublicHash = mHebePublicHash ?: loginStore.getLoginData("hebePublicHash", null); return mHebePublicHash } + set(value) { loginStore.putLoginData("hebePublicHash", value); mHebePublicHash = value } - private var mApiCertificateExpiryTime: Int? = null - var apiCertificateExpiryTime: Int - get() { mApiCertificateExpiryTime = mApiCertificateExpiryTime ?: loginStore.getLoginData("certificateExpiryTime", 0); return mApiCertificateExpiryTime ?: 0 } - set(value) { loginStore.putLoginData("certificateExpiryTime", value); mApiCertificateExpiryTime = value } + private var mHebeContext: String? = null + var hebeContext: String? + get() { mHebeContext = mHebeContext ?: profile?.getStudentData("hebeContext", null); return mHebeContext } + set(value) { profile?.putStudentData("hebeContext", value) ?: return; mHebeContext = value } + + private var mSenderAddressHash: String? = null + var senderAddressHash: String? + get() { mSenderAddressHash = mSenderAddressHash ?: profile?.getStudentData("senderAddressHash", null); return mSenderAddressHash } + set(value) { profile?.putStudentData("senderAddressHash", value) ?: return; mSenderAddressHash = value } + + private var mSenderAddressName: String? = null + var senderAddressName: String? + get() { mSenderAddressName = mSenderAddressName ?: profile?.getStudentData("senderAddressName", null); return mSenderAddressName } + set(value) { profile?.putStudentData("senderAddressName", value) ?: return; mSenderAddressName = value } val apiUrl: String? get() { - val url = when (apiToken?.substring(0, 3)) { + val url = when (apiToken[symbol]?.substring(0, 3)) { "3S1" -> "https://lekcjaplus.vulcan.net.pl" "TA1" -> "https://uonetplus-komunikacja.umt.tarnow.pl" "OP1" -> "https://uonetplus-komunikacja.eszkola.opolskie.pl" @@ -170,15 +248,73 @@ class DataVulcan(app: App, profile: Profile?, loginStore: LoginStore) : Data(app "P01" -> "http://efeb-komunikacja.pro-hudson.win.vulcan.pl" "P02" -> "http://efeb-komunikacja.pro-hudsonrc.win.vulcan.pl" "P90" -> "http://efeb-komunikacja-pro-mwujakowska.neo.win.vulcan.pl" + "KO1" -> "https://uonetplus-komunikacja.eduportal.koszalin.pl" "FK1", "FS1" -> "http://api.fakelog.cf" - "SZ9" -> "http://vulcan.szkolny.eu" + "SZ9" -> "http://hack.szkolny.eu" else -> null } - return if (url != null) "$url/$symbol" else loginStore.getLoginData("apiUrl", null) + return if (url != null) "$url/$symbol/" else loginStore.getLoginData("apiUrl", null) } - val fullApiUrl: String? + val fullApiUrl: String get() { - return "$apiUrl/$schoolSymbol" + return "$apiUrl$schoolSymbol/" } + + /* __ __ _ ______ _____ _ _ + \ \ / / | | | ____/ ____| | | (_) + \ \ /\ / /__| |__ | |__ | (___ | | ___ __ _ _ _ __ + \ \/ \/ / _ \ '_ \ | __| \___ \ | | / _ \ / _` | | '_ \ + \ /\ / __/ |_) | | | ____) | | |___| (_) | (_| | | | | | + \/ \/ \___|_.__/ |_| |_____/ |______\___/ \__, |_|_| |_| + __/ | + |__*/ + var webRealmData: RealmData? + get() { mWebRealmData = mWebRealmData ?: loginStore.getLoginData("webRealmData", JsonObject()).let { + app.gson.fromJson(it, RealmData::class.java) + }; return mWebRealmData } + set(value) { loginStore.putLoginData("webRealmData", app.gson.toJsonTree(value) as JsonObject); mWebRealmData = value } + private var mWebRealmData: RealmData? = null + + val webHost + get() = webRealmData?.host + + var webEmail: String? + get() { mWebEmail = mWebEmail ?: loginStore.getLoginData("webEmail", null); return mWebEmail } + set(value) { loginStore.putLoginData("webEmail", value); mWebEmail = value } + private var mWebEmail: String? = null + var webUsername: String? + get() { mWebUsername = mWebUsername ?: loginStore.getLoginData("webUsername", null); return mWebUsername } + set(value) { loginStore.putLoginData("webUsername", value); mWebUsername = value } + private var mWebUsername: String? = null + var webPassword: String? + get() { mWebPassword = mWebPassword ?: loginStore.getLoginData("webPassword", null); return mWebPassword } + set(value) { loginStore.putLoginData("webPassword", value); mWebPassword = value } + private var mWebPassword: String? = null + + /** + * Expiry time of a certificate POSTed to a LoginEndpoint of the specific symbol. + * If the time passes, the certificate needs to be POSTed again (if valid) + * or re-generated. + */ + var webExpiryTime: Map = mapOf() + get() { mWebExpiryTime = mWebExpiryTime ?: loginStore.getLoginData("webExpiryTime", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebExpiryTime ?: mapOf() } + set(value) { loginStore.putLoginData("webExpiryTime", app.gson.toJson(value)); mWebExpiryTime = value } + private var mWebExpiryTime: Map? = null + + /** + * EfebSsoAuthCookie retrieved after posting a certificate + */ + var webAuthCookie: Map = mapOf() + get() { mWebAuthCookie = mWebAuthCookie ?: loginStore.getLoginData("webAuthCookie", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebAuthCookie ?: mapOf() } + set(value) { loginStore.putLoginData("webAuthCookie", app.gson.toJson(value)); mWebAuthCookie = value } + private var mWebAuthCookie: Map? = null + + /** + * Permissions needed to get JSONs from home page + */ + var webPermissions: Map = mapOf() + get() { mWebPermissions = mWebPermissions ?: loginStore.getLoginData("webPermissions", null)?.let { app.gson.fromJson(it, field.toMutableMap()::class.java) }; return mWebPermissions ?: mapOf() } + set(value) { loginStore.putLoginData("webPermissions", app.gson.toJson(value)); mWebPermissions = value } + private var mWebPermissions: Map? = null } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/Vulcan.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/Vulcan.kt index c30f1fd0..d066aca0 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/Vulcan.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/Vulcan.kt @@ -5,23 +5,30 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan import com.google.gson.JsonObject +import org.greenrobot.eventbus.EventBus import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.data.api.CODE_INTERNAL_LIBRUS_ACCOUNT_410 +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.helper.OneDriveDownloadAttachment import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanData -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.VulcanApiMessagesChangeStatus +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeMessagesChangeStatus +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeSendMessage import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.firstlogin.VulcanFirstLogin import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLogin -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi +import pl.szczodrzynski.edziennik.data.api.events.AttachmentGetEvent +import pl.szczodrzynski.edziennik.data.api.events.EventGetEvent +import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.api.prepare -import pl.szczodrzynski.edziennik.data.api.vulcanLoginMethods -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.data.db.full.MessageFull +import pl.szczodrzynski.edziennik.utils.Utils import pl.szczodrzynski.edziennik.utils.Utils.d +import java.io.File class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface { companion object { @@ -30,6 +37,7 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va val internalErrorList = mutableListOf() val data: DataVulcan + private var afterLogin: (() -> Unit)? = null init { data = DataVulcan(app, profile, loginStore).apply { @@ -40,9 +48,7 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va private fun completed() { data.saveData() - data.notify { - callback.onCompleted() - } + callback.onCompleted() } /* _______ _ _ _ _ _ @@ -53,40 +59,117 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va |_| |_| |_|\___| /_/ \_\_|\__, |\___/|_| |_|\__|_| |_|_| |_| |_| __/ | |__*/ - override fun sync(featureIds: List, viewId: Int?, arguments: JsonObject?) { + override fun sync(featureIds: List, viewId: Int?, onlyEndpoints: List?, arguments: JsonObject?) { data.arguments = arguments - data.prepare(vulcanLoginMethods, VulcanFeatures, featureIds, viewId) - d(TAG, "LoginMethod IDs: ${data.targetLoginMethodIds}") - d(TAG, "Endpoint IDs: ${data.targetEndpointIds}") + data.prepare(vulcanLoginMethods, VulcanFeatures, featureIds, viewId, onlyEndpoints) + login() + } + + private fun login(loginMethodId: Int? = null, afterLogin: (() -> Unit)? = null) { + if (data.loginStore.mode == LOGIN_MODE_VULCAN_API) { + data.error(TAG, ERROR_VULCAN_API_DEPRECATED) + return + } + + d(TAG, "Trying to login with ${data.targetLoginMethodIds}") + if (internalErrorList.isNotEmpty()) { + d(TAG, " - Internal errors:") + internalErrorList.forEach { d(TAG, " - code $it") } + } + loginMethodId?.let { data.prepareFor(vulcanLoginMethods, it) } + afterLogin?.let { this.afterLogin = it } VulcanLogin(data) { - VulcanData(data) { - completed() - } + data() } } - override fun getMessage(message: MessageFull) { - VulcanLoginApi(data) { - VulcanApiMessagesChangeStatus(data, message) { - completed() - } + private fun data() { + d(TAG, "Endpoint IDs: ${data.targetEndpointIds}") + if (internalErrorList.isNotEmpty()) { + d(TAG, " - Internal errors:") + internalErrorList.forEach { d(TAG, " - code $it") } } - } - - override fun markAllAnnouncementsAsRead() { - - } - - override fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) { - - } - - override fun firstLogin() { - VulcanFirstLogin(data) { + afterLogin?.invoke() ?: VulcanData(data) { completed() } } + override fun getMessage(message: MessageFull) { + login(LOGIN_METHOD_VULCAN_HEBE) { + if (message.seen) { + EventBus.getDefault().postSticky(MessageGetEvent(message)) + completed() + return@login + } + VulcanHebeMessagesChangeStatus(data, message) { + completed() + } + } + } + + override fun sendMessage(recipients: List, subject: String, text: String) { + login(LOGIN_METHOD_VULCAN_HEBE) { + VulcanHebeSendMessage(data, recipients, subject, text) { + completed() + } + } + } + + override fun markAllAnnouncementsAsRead() {} + override fun getAnnouncement(announcement: AnnouncementFull) {} + override fun getRecipientList() {} + + override fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) { + val fileUrl = attachmentName.substringAfter(":") + if (attachmentName == fileUrl) { + data.error(ApiError(TAG, ERROR_ONEDRIVE_DOWNLOAD)) + return + } + + OneDriveDownloadAttachment( + app, + fileUrl, + onSuccess = { file -> + val event = AttachmentGetEvent( + data.profileId, + owner, + attachmentId, + AttachmentGetEvent.TYPE_FINISHED, + file.absolutePath + ) + + val attachmentDataFile = File(Utils.getStorageDir(), ".${data.profileId}_${event.ownerId}_${event.attachmentId}") + Utils.writeStringToFile(attachmentDataFile, event.fileName) + + EventBus.getDefault().postSticky(event) + + completed() + }, + onProgress = { written, _ -> + val event = AttachmentGetEvent( + data.profileId, + owner, + attachmentId, + AttachmentGetEvent.TYPE_PROGRESS, + bytesWritten = written + ) + + EventBus.getDefault().postSticky(event) + }, + onError = { apiError -> + data.error(apiError) + } + ) + } + + override fun getEvent(eventFull: EventFull) { + eventFull.homeworkBody = "" + + EventBus.getDefault().postSticky(EventGetEvent(eventFull)) + completed() + } + + override fun firstLogin() { VulcanFirstLogin(data) { completed() } } override fun cancel() { d(TAG, "Cancelled") data.cancel() @@ -94,29 +177,17 @@ class Vulcan(val app: App, val profile: Profile?, val loginStore: LoginStore, va private fun wrapCallback(callback: EdziennikCallback): EdziennikCallback { return object : EdziennikCallback { - override fun onCompleted() { - callback.onCompleted() - } - - override fun onProgress(step: Float) { - callback.onProgress(step) - } - - override fun onStartProgress(stringRes: Int) { - callback.onStartProgress(stringRes) - } - + override fun onCompleted() { callback.onCompleted() } + override fun onProgress(step: Float) { callback.onProgress(step) } + override fun onStartProgress(stringRes: Int) { callback.onStartProgress(stringRes) } override fun onError(apiError: ApiError) { + if (apiError.errorCode in internalErrorList) { + // finish immediately if the same error occurs twice during the same sync + callback.onError(apiError) + return + } + internalErrorList.add(apiError.errorCode) when (apiError.errorCode) { - in internalErrorList -> { - // finish immediately if the same error occurs twice during the same sync - callback.onError(apiError) - } - CODE_INTERNAL_LIBRUS_ACCOUNT_410 -> { - internalErrorList.add(apiError.errorCode) - loginStore.removeLoginData("refreshToken") // force a clean login - //loginLibrus() - } else -> callback.onError(apiError) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/VulcanFeatures.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/VulcanFeatures.kt index bf6c080b..2e239a7e 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/VulcanFeatures.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/VulcanFeatures.kt @@ -7,79 +7,82 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.models.Feature -const val ENDPOINT_VULCAN_API_STUDENT_LIST = 1000 -const val ENDPOINT_VULCAN_API_DICTIONARIES = 1010 -const val ENDPOINT_VULCAN_API_TIMETABLE = 1020 -const val ENDPOINT_VULCAN_API_EVENTS = 1030 -const val ENDPOINT_VULCAN_API_GRADES = 1040 -const val ENDPOINT_VULCAN_API_GRADES_SUMMARY = 1050 -const val ENDPOINT_VULCAN_API_HOMEWORK = 1060 -const val ENDPOINT_VULCAN_API_NOTICES = 1070 -const val ENDPOINT_VULCAN_API_ATTENDANCE = 1080 -const val ENDPOINT_VULCAN_API_MESSAGES_INBOX = 1090 -const val ENDPOINT_VULCAN_API_MESSAGES_SENT = 1100 +const val ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS = 2010 + +const val ENDPOINT_VULCAN_HEBE_MAIN = 3000 +const val ENDPOINT_VULCAN_HEBE_PUSH_CONFIG = 3005 +const val ENDPOINT_VULCAN_HEBE_ADDRESSBOOK = 3010 +const val ENDPOINT_VULCAN_HEBE_TIMETABLE = 3020 +const val ENDPOINT_VULCAN_HEBE_EXAMS = 3030 +const val ENDPOINT_VULCAN_HEBE_GRADES = 3040 +const val ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY = 3050 +const val ENDPOINT_VULCAN_HEBE_HOMEWORK = 3060 +const val ENDPOINT_VULCAN_HEBE_NOTICES = 3070 +const val ENDPOINT_VULCAN_HEBE_ATTENDANCE = 3080 +const val ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX = 3090 +const val ENDPOINT_VULCAN_HEBE_MESSAGES_SENT = 3100 +const val ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER = 3200 val VulcanFeatures = listOf( // timetable Feature(LOGIN_TYPE_VULCAN, FEATURE_TIMETABLE, listOf( - ENDPOINT_VULCAN_API_TIMETABLE to LOGIN_METHOD_VULCAN_API - ), listOf(LOGIN_METHOD_VULCAN_API)), + ENDPOINT_VULCAN_HEBE_TIMETABLE to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)), // agenda Feature(LOGIN_TYPE_VULCAN, FEATURE_AGENDA, listOf( - ENDPOINT_VULCAN_API_EVENTS to LOGIN_METHOD_VULCAN_API - ), listOf(LOGIN_METHOD_VULCAN_API)), + ENDPOINT_VULCAN_HEBE_EXAMS to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)), // grades Feature(LOGIN_TYPE_VULCAN, FEATURE_GRADES, listOf( - ENDPOINT_VULCAN_API_GRADES to LOGIN_METHOD_VULCAN_API, - ENDPOINT_VULCAN_API_GRADES_SUMMARY to LOGIN_METHOD_VULCAN_API - ), listOf(LOGIN_METHOD_VULCAN_API)), + ENDPOINT_VULCAN_HEBE_GRADES to LOGIN_METHOD_VULCAN_HEBE, + ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)), // homework Feature(LOGIN_TYPE_VULCAN, FEATURE_HOMEWORK, listOf( - ENDPOINT_VULCAN_API_HOMEWORK to LOGIN_METHOD_VULCAN_API - ), listOf(LOGIN_METHOD_VULCAN_API)), + ENDPOINT_VULCAN_HEBE_HOMEWORK to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)), // behaviour Feature(LOGIN_TYPE_VULCAN, FEATURE_BEHAVIOUR, listOf( - ENDPOINT_VULCAN_API_NOTICES to LOGIN_METHOD_VULCAN_API - ), listOf(LOGIN_METHOD_VULCAN_API)), + ENDPOINT_VULCAN_HEBE_NOTICES to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)), // attendance Feature(LOGIN_TYPE_VULCAN, FEATURE_ATTENDANCE, listOf( - ENDPOINT_VULCAN_API_ATTENDANCE to LOGIN_METHOD_VULCAN_API - ), listOf(LOGIN_METHOD_VULCAN_API)), + ENDPOINT_VULCAN_HEBE_ATTENDANCE to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)), // messages Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_INBOX, listOf( - ENDPOINT_VULCAN_API_MESSAGES_INBOX to LOGIN_METHOD_VULCAN_API - ), listOf(LOGIN_METHOD_VULCAN_API)), + ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)), Feature(LOGIN_TYPE_VULCAN, FEATURE_MESSAGES_SENT, listOf( - ENDPOINT_VULCAN_API_MESSAGES_SENT to LOGIN_METHOD_VULCAN_API - ), listOf(LOGIN_METHOD_VULCAN_API)), + ENDPOINT_VULCAN_HEBE_MESSAGES_SENT to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)), + + // push config + Feature(LOGIN_TYPE_VULCAN, FEATURE_PUSH_CONFIG, listOf( + ENDPOINT_VULCAN_HEBE_PUSH_CONFIG to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)).withShouldSync { data -> + !data.app.config.sync.tokenVulcanList.contains(data.profileId) + }, + + /** + * Lucky number - using WEB Main. + */ + Feature(LOGIN_TYPE_VULCAN, FEATURE_LUCKY_NUMBER, listOf( + ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS to LOGIN_METHOD_VULCAN_WEB_MAIN + ), listOf(LOGIN_METHOD_VULCAN_WEB_MAIN)) + .withShouldSync { data -> data.shouldSyncLuckyNumber() } + .withPriority(2), + /** + * Lucky number - using Hebe API + */ + Feature(LOGIN_TYPE_VULCAN, FEATURE_LUCKY_NUMBER, listOf( + ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)) + .withShouldSync { data -> data.shouldSyncLuckyNumber() } + .withPriority(1), Feature(LOGIN_TYPE_VULCAN, FEATURE_ALWAYS_NEEDED, listOf( - ENDPOINT_VULCAN_API_STUDENT_LIST to LOGIN_METHOD_VULCAN_API, - ENDPOINT_VULCAN_API_DICTIONARIES to LOGIN_METHOD_VULCAN_API - ), listOf(LOGIN_METHOD_VULCAN_API)) - /*Feature(LOGIN_TYPE_VULCAN, FEATURE_STUDENT_INFO, listOf( - ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB - ), listOf(LOGIN_METHOD_VULCAN_WEB)), - Feature(LOGIN_TYPE_VULCAN, FEATURE_STUDENT_NUMBER, listOf( - ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB - ), listOf(LOGIN_METHOD_VULCAN_WEB)), - Feature(LOGIN_TYPE_VULCAN, FEATURE_SCHOOL_INFO, listOf( - ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB - ), listOf(LOGIN_METHOD_VULCAN_WEB)), - Feature(LOGIN_TYPE_VULCAN, FEATURE_CLASS_INFO, listOf( - ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB - ), listOf(LOGIN_METHOD_VULCAN_WEB)), - Feature(LOGIN_TYPE_VULCAN, FEATURE_TEAM_INFO, listOf( - ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB - ), listOf(LOGIN_METHOD_VULCAN_WEB)), - Feature(LOGIN_TYPE_VULCAN, FEATURE_TEACHERS, listOf( - ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB - ), listOf(LOGIN_METHOD_VULCAN_WEB)), - Feature(LOGIN_TYPE_VULCAN, FEATURE_SUBJECTS, listOf( - ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB - ), listOf(LOGIN_METHOD_VULCAN_WEB)), - Feature(LOGIN_TYPE_VULCAN, FEATURE_CLASSROOMS, listOf( - ENDPOINT_VULCAN_API to LOGIN_METHOD_VULCAN_WEB - ), listOf(LOGIN_METHOD_VULCAN_WEB)),*/ - + ENDPOINT_VULCAN_HEBE_MAIN to LOGIN_METHOD_VULCAN_HEBE, + ENDPOINT_VULCAN_HEBE_ADDRESSBOOK to LOGIN_METHOD_VULCAN_HEBE + ), listOf(LOGIN_METHOD_VULCAN_HEBE)) ) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt deleted file mode 100644 index 85ea8417..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanApi.kt +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-10-19 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data - -import com.google.gson.JsonArray -import com.google.gson.JsonObject -import im.wangchao.mhttp.Request -import im.wangchao.mhttp.Response -import im.wangchao.mhttp.callback.JsonCallbackHandler -import io.github.wulkanowy.signer.android.signContent -import pl.szczodrzynski.edziennik.data.api.* -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team -import pl.szczodrzynski.edziennik.utils.Utils -import pl.szczodrzynski.edziennik.utils.Utils.d -import java.net.HttpURLConnection -import java.util.* - -open class VulcanApi(open val data: DataVulcan) { - companion object { - const val TAG = "VulcanApi" - } - - val profileId - get() = data.profile?.id ?: -1 - - fun apiGet( - tag: String, - endpoint: String, - method: Int = POST, - parameters: Map = emptyMap(), - baseUrl: Boolean = false, - onSuccess: (json: JsonObject, response: Response?) -> Unit - ) { - val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}/$endpoint" - - d(tag, "Request: Vulcan/Api - $url") - - if (data.teamList.size() == 0) { - data.profile?.studentClassName?.also { name -> - val id = Utils.crc16(name.toByteArray()).toLong() - - val teamObject = Team( - profileId, - id, - name, - Team.TYPE_CLASS, - "${data.schoolName}:$name", - -1 - ) - data.teamList.put(id, teamObject) - } - } - - val finalPayload = JsonObject() - parameters.map { (name, value) -> - when (value) { - is JsonObject -> finalPayload.add(name, value) - is JsonArray -> finalPayload.add(name, value) - is String -> finalPayload.addProperty(name, value) - is Int -> finalPayload.addProperty(name, value) - is Long -> finalPayload.addProperty(name, value) - is Float -> finalPayload.addProperty(name, value) - is Char -> finalPayload.addProperty(name, value) - } - } - finalPayload.addProperty("RemoteMobileTimeKey", System.currentTimeMillis() / 1000) - finalPayload.addProperty("TimeKey", System.currentTimeMillis() / 1000 - 1) - finalPayload.addProperty("RequestId", UUID.randomUUID().toString()) - finalPayload.addProperty("RemoteMobileAppVersion", VULCAN_API_APP_VERSION) - finalPayload.addProperty("RemoteMobileAppName", VULCAN_API_APP_NAME) - - val callback = object : JsonCallbackHandler() { - override fun onSuccess(json: JsonObject?, response: Response?) { - if (json == null && response?.parserErrorBody == null) { - data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) - .withResponse(response)) - return - } - - if (response?.code() ?: 200 != 200) { - when (response?.code()) { - 503 -> ERROR_VULCAN_API_MAINTENANCE - 400 -> ERROR_VULCAN_API_BAD_REQUEST - else -> ERROR_VULCAN_API_OTHER - }.let { errorCode -> - data.error(ApiError(tag, errorCode) - .withResponse(response) - .withApiResponse(json?.toString() ?: response?.parserErrorBody)) - return - } - } - - if (json == null) { - data.error(ApiError(tag, ERROR_RESPONSE_EMPTY) - .withResponse(response)) - return - } - - try { - onSuccess(json, response) - } catch (e: Exception) { - data.error(ApiError(tag, EXCEPTION_VULCAN_API_REQUEST) - .withResponse(response) - .withThrowable(e) - .withApiResponse(json)) - } - } - - override fun onFailure(response: Response?, throwable: Throwable?) { - data.error(ApiError(tag, ERROR_REQUEST_FAILURE) - .withResponse(response) - .withThrowable(throwable)) - } - } - - Request.builder() - .url(url) - .userAgent(VULCAN_API_USER_AGENT) - .addHeader("RequestCertificateKey", data.apiCertificateKey) - .addHeader("RequestSignatureValue", - try { - signContent( - data.apiCertificatePrivate ?: "", - finalPayload.toString() - ) - } catch (e: Exception) {e.printStackTrace();""}) - .apply { - when (method) { - GET -> get() - POST -> post() - } - } - .setJsonBody(finalPayload) - .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST) - .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN) - .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED) - .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE) - .callback(callback) - .build() - .enqueue() - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanData.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanData.kt index 378c5102..0724ca46 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanData.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanData.kt @@ -6,7 +6,9 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data import pl.szczodrzynski.edziennik.R import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.* -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.* +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.web.VulcanWebLuckyNumber +import pl.szczodrzynski.edziennik.data.db.entity.Message import pl.szczodrzynski.edziennik.utils.Utils class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) { @@ -14,8 +16,35 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) { private const val TAG = "VulcanData" } + private var firstSemesterSync = false + private val firstSemesterSyncExclude = listOf( + ENDPOINT_VULCAN_HEBE_MAIN, + ENDPOINT_VULCAN_HEBE_PUSH_CONFIG, + ENDPOINT_VULCAN_HEBE_ADDRESSBOOK, + ENDPOINT_VULCAN_HEBE_TIMETABLE, + ENDPOINT_VULCAN_HEBE_EXAMS, + ENDPOINT_VULCAN_HEBE_HOMEWORK, + ENDPOINT_VULCAN_HEBE_NOTICES, + ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX, + ENDPOINT_VULCAN_HEBE_MESSAGES_SENT, + ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER + ) + init { - nextEndpoint(onSuccess) + if (data.studentSemesterNumber == 2 && data.profile?.empty != false) { + firstSemesterSync = true + // set to sync 1st semester first + data.studentSemesterId = data.semester1Id + data.studentSemesterNumber = 1 + } + nextEndpoint { + if (firstSemesterSync) { + // at the end, set back 2nd semester + data.studentSemesterId = data.semester2Id + data.studentSemesterNumber = 2 + } + onSuccess() + } } private fun nextEndpoint(onSuccess: () -> Unit) { @@ -27,56 +56,97 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) { onSuccess() return } - useEndpoint(data.targetEndpointIds.removeAt(0)) { + val id = data.targetEndpointIds.firstKey() + val lastSync = data.targetEndpointIds.remove(id) + useEndpoint(id, lastSync) { + if (firstSemesterSync && id !in firstSemesterSyncExclude) { + // sync 2nd semester after every endpoint + data.studentSemesterId = data.semester2Id + data.studentSemesterNumber = 2 + useEndpoint(id, lastSync) { + // set 1st semester back for the next endpoint + data.studentSemesterId = data.semester1Id + data.studentSemesterNumber = 1 + // progress further + data.progress(data.progressStep) + nextEndpoint(onSuccess) + } + return@useEndpoint + } data.progress(data.progressStep) nextEndpoint(onSuccess) } } - private fun useEndpoint(endpointId: Int, onSuccess: () -> Unit) { - Utils.d(TAG, "Using endpoint $endpointId") + private fun useEndpoint(endpointId: Int, lastSync: Long?, onSuccess: (endpointId: Int) -> Unit) { + Utils.d(TAG, "Using endpoint $endpointId. Last sync time = $lastSync") when (endpointId) { - ENDPOINT_VULCAN_API_DICTIONARIES -> { - data.startProgress(R.string.edziennik_progress_endpoint_dictionaries) - VulcanApiDictionaries(data, onSuccess) + ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS -> { + data.startProgress(R.string.edziennik_progress_endpoint_lucky_number) + VulcanWebLuckyNumber(data, lastSync, onSuccess) } - ENDPOINT_VULCAN_API_GRADES -> { - data.startProgress(R.string.edziennik_progress_endpoint_grades) - VulcanApiGrades(data, onSuccess) + ENDPOINT_VULCAN_HEBE_MAIN -> { + if (data.profile == null) { + onSuccess(ENDPOINT_VULCAN_HEBE_MAIN) + return + } + data.startProgress(R.string.edziennik_progress_endpoint_student_info) + VulcanHebeMain(data, lastSync).getStudents( + profile = data.profile, + profileList = null + ) { + onSuccess(ENDPOINT_VULCAN_HEBE_MAIN) + } } - ENDPOINT_VULCAN_API_GRADES_SUMMARY -> { - data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades) - VulcanApiProposedGrades(data, onSuccess) + ENDPOINT_VULCAN_HEBE_PUSH_CONFIG -> { + data.startProgress(R.string.edziennik_progress_endpoint_push_config) + VulcanHebePushConfig(data, lastSync, onSuccess) } - ENDPOINT_VULCAN_API_EVENTS -> { - data.startProgress(R.string.edziennik_progress_endpoint_events) - VulcanApiEvents(data, isHomework = false, onSuccess = onSuccess) + ENDPOINT_VULCAN_HEBE_ADDRESSBOOK -> { + data.startProgress(R.string.edziennik_progress_endpoint_teachers) + VulcanHebeAddressbook(data, lastSync, onSuccess) } - ENDPOINT_VULCAN_API_HOMEWORK -> { - data.startProgress(R.string.edziennik_progress_endpoint_homework) - VulcanApiEvents(data, isHomework = true, onSuccess = onSuccess) - } - ENDPOINT_VULCAN_API_NOTICES -> { - data.startProgress(R.string.edziennik_progress_endpoint_notices) - VulcanApiNotices(data, onSuccess) - } - ENDPOINT_VULCAN_API_ATTENDANCE -> { - data.startProgress(R.string.edziennik_progress_endpoint_attendance) - VulcanApiAttendance(data, onSuccess) - } - ENDPOINT_VULCAN_API_TIMETABLE -> { + ENDPOINT_VULCAN_HEBE_TIMETABLE -> { data.startProgress(R.string.edziennik_progress_endpoint_timetable) - VulcanApiTimetable(data, onSuccess) + VulcanHebeTimetable(data, lastSync, onSuccess) } - ENDPOINT_VULCAN_API_MESSAGES_INBOX -> { + ENDPOINT_VULCAN_HEBE_EXAMS -> { + data.startProgress(R.string.edziennik_progress_endpoint_exams) + VulcanHebeExams(data, lastSync, onSuccess) + } + ENDPOINT_VULCAN_HEBE_GRADES -> { + data.startProgress(R.string.edziennik_progress_endpoint_grades) + VulcanHebeGrades(data, lastSync, onSuccess) + } + ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY -> { + data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades) + VulcanHebeGradeSummary(data, lastSync, onSuccess) + } + ENDPOINT_VULCAN_HEBE_HOMEWORK -> { + data.startProgress(R.string.edziennik_progress_endpoint_homework) + VulcanHebeHomework(data, lastSync, onSuccess) + } + ENDPOINT_VULCAN_HEBE_NOTICES -> { + data.startProgress(R.string.edziennik_progress_endpoint_notices) + VulcanHebeNotices(data, lastSync, onSuccess) + } + ENDPOINT_VULCAN_HEBE_ATTENDANCE -> { + data.startProgress(R.string.edziennik_progress_endpoint_attendance) + VulcanHebeAttendance(data, lastSync, onSuccess) + } + ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX -> { data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox) - VulcanApiMessagesInbox(data, onSuccess) + VulcanHebeMessages(data, lastSync, onSuccess).getMessages(Message.TYPE_RECEIVED) } - ENDPOINT_VULCAN_API_MESSAGES_SENT -> { + ENDPOINT_VULCAN_HEBE_MESSAGES_SENT -> { data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox) - VulcanApiMessagesSent(data, onSuccess) + VulcanHebeMessages(data, lastSync, onSuccess).getMessages(Message.TYPE_SENT) } - else -> onSuccess() + ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER -> { + data.startProgress(R.string.edziennik_progress_endpoint_lucky_number) + VulcanHebeLuckyNumber(data, lastSync, onSuccess) + } + else -> onSuccess(endpointId) } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt new file mode 100644 index 00000000..a34e0a1b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanHebe.kt @@ -0,0 +1,416 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-20. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data + +import android.os.Build +import androidx.core.util.set +import com.google.gson.JsonArray +import com.google.gson.JsonElement +import com.google.gson.JsonObject +import im.wangchao.mhttp.Request +import im.wangchao.mhttp.Response +import im.wangchao.mhttp.body.MediaTypeUtils +import im.wangchao.mhttp.callback.JsonCallbackHandler +import io.github.wulkanowy.signer.hebe.getSignatureHeaders +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.HebeFilterType +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.data.db.entity.LessonRange +import pl.szczodrzynski.edziennik.data.db.entity.Subject +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.entity.Team +import pl.szczodrzynski.edziennik.utils.Utils.d +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time +import java.net.HttpURLConnection +import java.net.URLEncoder +import java.time.Instant +import java.time.LocalDateTime +import java.time.ZoneId +import java.time.ZonedDateTime +import java.time.format.DateTimeFormatter +import java.util.* + +open class VulcanHebe(open val data: DataVulcan, open val lastSync: Long?) { + companion object { + const val TAG = "VulcanHebe" + } + + val profileId + get() = data.profile?.id ?: -1 + + val profile + get() = data.profile + + fun getDateTime( + json: JsonObject?, + key: String, + default: Long = System.currentTimeMillis() + ): Long { + val date = json.getJsonObject(key) + return date.getLong("Timestamp") ?: return default + } + + fun getDate(json: JsonObject?, key: String): Date? { + val date = json.getJsonObject(key) + return date.getString("Date")?.let { Date.fromY_m_d(it) } + } + + fun getTeacherId(json: JsonObject?, key: String): Long? { + val teacher = json.getJsonObject(key) + val teacherId = teacher.getLong("Id") ?: return null + if (data.teacherList[teacherId] == null) { + data.teacherList[teacherId] = Teacher( + data.profileId, + teacherId, + teacher.getString("Name") ?: "", + teacher.getString("Surname") ?: "" + ) + } + return teacherId + } + + fun getSubjectId(json: JsonObject?, key: String): Long? { + val subject = json.getJsonObject(key) + val subjectId = subject.getLong("Id") ?: return null + if (data.subjectList[subjectId] == null) { + data.subjectList[subjectId] = Subject( + data.profileId, + subjectId, + subject.getString("Name") ?: "", + subject.getString("Kod") ?: "" + ) + } + return subjectId + } + + fun getTeamId(json: JsonObject?, key: String): Long? { + val team = json.getJsonObject(key) + val teamId = team.getLong("Id") ?: return null + if (data.teamList[teamId] == null) { + var name = team.getString("Shortcut") + ?: team.getString("Name") + ?: "" + name = "${profile?.studentClassName ?: ""} $name" + data.teamList[teamId] = Team( + data.profileId, + teamId, + name, + Team.TYPE_VIRTUAL, + "${data.schoolCode}:$name", + -1 + ) + } + return teamId + } + + fun getClassId(json: JsonObject?, key: String): Long? { + val team = json.getJsonObject(key) + val teamId = team.getLong("Id") ?: return null + if (data.teamList[teamId] == null) { + val name = data.profile?.studentClassName + ?: team.getString("Name") + ?: "" + data.teamList[teamId] = Team( + data.profileId, + teamId, + name, + Team.TYPE_CLASS, + "${data.schoolCode}:$name", + -1 + ) + } + return teamId + } + + fun getLessonRange(json: JsonObject?, key: String): LessonRange? { + val timeslot = json.getJsonObject(key) + val position = timeslot.getInt("Position") ?: return null + val start = timeslot.getString("Start") ?: return null + val end = timeslot.getString("End") ?: return null + val lessonRange = LessonRange( + data.profileId, + position, + Time.fromH_m(start), + Time.fromH_m(end) + ) + data.lessonRanges[position] = lessonRange + return lessonRange + } + + fun getSemester(json: JsonObject?): Int { + val periodId = json.getInt("PeriodId") ?: return 1 + return if (periodId == data.semester1Id) + 1 + else + 2 + } + + fun isCurrentYear(date: Date): Boolean { + return profile?.let { profile -> + return@let date >= profile.dateSemester1Start + } ?: false + } + + fun isCurrentYear(dateTime: Long): Boolean { + return profile?.let { profile -> + return@let dateTime >= profile.dateSemester1Start.inMillis + } ?: false + } + + inline fun apiRequest( + tag: String, + endpoint: String, + method: Int = GET, + payload: JsonElement? = null, + baseUrl: Boolean = false, + firebaseToken: String? = null, + crossinline onSuccess: (json: T, response: Response?) -> Unit + ) { + val url = "${if (baseUrl) data.apiUrl else data.fullApiUrl}$endpoint" + + d(tag, "Request: Vulcan/Hebe - $url") + + val privateKey = data.hebePrivateKey + val publicHash = data.hebePublicHash + + if (privateKey == null || publicHash == null) { + data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING)) + return + } + + val timestamp = ZonedDateTime.now(ZoneId.of("GMT")) + val timestampMillis = timestamp.toInstant().toEpochMilli() + val timestampIso = timestamp.format(DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss")) + + val finalPayload = if (payload != null) { + JsonObject( + "AppName" to VULCAN_HEBE_APP_NAME, + "AppVersion" to VULCAN_HEBE_APP_VERSION, + "CertificateId" to publicHash, + "Envelope" to payload, + "FirebaseToken" to (firebaseToken ?: data.app.config.sync.tokenVulcanHebe), + "API" to 1, + "RequestId" to UUID.randomUUID().toString(), + "Timestamp" to timestampMillis, + "TimestampFormatted" to timestampIso + ) + } else null + val jsonString = finalPayload?.toString() + + val headers = getSignatureHeaders( + publicHash, + privateKey, + jsonString, + endpoint, + timestamp + ) + + val callback = object : JsonCallbackHandler() { + override fun onSuccess(json: JsonObject?, response: Response?) { + if (json == null) { + data.error( + ApiError(TAG, ERROR_RESPONSE_EMPTY) + .withResponse(response) + ) + return + } + + val status = json.getJsonObject("Status") + val statusCode = status?.getInt("Code") ?: 0 + if (statusCode != 0) { + val statusMessage = status?.getString("Message") + val errorCode = when (statusCode) { + -1 -> ERROR_VULCAN_HEBE_SERVER_ERROR + 100 -> ERROR_VULCAN_HEBE_SIGNATURE_ERROR + 101 -> ERROR_VULCAN_HEBE_INVALID_PAYLOAD + 106 -> ERROR_VULCAN_HEBE_FIREBASE_ERROR + 108 -> ERROR_VULCAN_HEBE_CERTIFICATE_GONE + 200 -> when (true) { + statusMessage?.contains("Class") -> ERROR_LOGIN_VULCAN_NO_PUPILS + statusMessage?.contains("Token") -> ERROR_LOGIN_VULCAN_INVALID_TOKEN + else -> ERROR_VULCAN_HEBE_ENTITY_NOT_FOUND + } + 201 -> ERROR_LOGIN_VULCAN_EXPIRED_TOKEN + 203 -> when (json.getJsonObject("Envelope").getInt("AvailableRetries")) { + 2 -> ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING + 1 -> ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING + else -> ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING + } + 204 -> ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING + else -> ERROR_VULCAN_HEBE_OTHER + } + data.error( + ApiError(tag, errorCode) + .withResponse(response) + .withApiResponse(json.toString()) + ) + return + } + + val envelope = if (json.get("Envelope").isJsonNull && null is T) + null as T + else when (T::class.java) { + JsonObject::class.java -> json.getJsonObject("Envelope") as T + JsonArray::class.java -> json.getJsonArray("Envelope") as T + java.lang.Boolean::class.java -> json.getBoolean("Envelope") as T + else -> { + data.error( + ApiError(tag, ERROR_RESPONSE_EMPTY) + .withResponse(response) + .withApiResponse(json) + ) + return + } + } + + try { + onSuccess(envelope, response) + } catch (e: Exception) { + data.error( + ApiError(tag, EXCEPTION_VULCAN_HEBE_REQUEST) + .withResponse(response) + .withThrowable(e) + .withApiResponse(json) + ) + } + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + data.error( + ApiError(tag, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable) + ) + } + } + + Request.builder() + .url(url) + .userAgent(VULCAN_HEBE_USER_AGENT) + .addHeader("vOS", "Android") + .addHeader("vDeviceModel", Build.MODEL) + .addHeader("vAPI", "1") + .apply { + if (data.hebeContext != null) + addHeader("vContext", data.hebeContext) + headers.forEach { + addHeader(it.key, it.value) + } + when (method) { + GET -> get() + POST -> { + post() + setTextBody(jsonString, MediaTypeUtils.APPLICATION_JSON) + } + } + } + .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST) + .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN) + .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED) + .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE) + .callback(callback) + .build() + .enqueue() + } + + inline fun apiGet( + tag: String, + endpoint: String, + query: Map = mapOf(), + baseUrl: Boolean = false, + firebaseToken: String? = null, + crossinline onSuccess: (json: T, response: Response?) -> Unit + ) { + val queryPath = query.map { + it.key + "=" + URLEncoder.encode(it.value, "UTF-8").replace("+", "%20") + }.join("&") + apiRequest( + tag, + if (query.isNotEmpty()) "$endpoint?$queryPath" else endpoint, + baseUrl = baseUrl, + firebaseToken = firebaseToken, + onSuccess = onSuccess + ) + } + + inline fun apiPost( + tag: String, + endpoint: String, + payload: JsonElement, + baseUrl: Boolean = false, + firebaseToken: String? = null, + crossinline onSuccess: (json: T, response: Response?) -> Unit + ) { + apiRequest( + tag, + endpoint, + method = POST, + payload, + baseUrl = baseUrl, + firebaseToken = firebaseToken, + onSuccess = onSuccess + ) + } + + fun apiGetList( + tag: String, + endpoint: String, + filterType: HebeFilterType? = null, + dateFrom: Date? = null, + dateTo: Date? = null, + lastSync: Long? = null, + folder: Int? = null, + params: Map = mapOf(), + includeFilterType: Boolean = true, + onSuccess: (data: List, response: Response?) -> Unit + ) { + val url = if (includeFilterType && filterType != null) + "$endpoint/${filterType.endpoint}" + else endpoint + + val query = params.toMutableMap() + + when (filterType) { + HebeFilterType.BY_PUPIL -> { + query["unitId"] = data.studentUnitId.toString() + query["pupilId"] = data.studentId.toString() + query["periodId"] = data.studentSemesterId.toString() + } + HebeFilterType.BY_PERSON -> { + query["loginId"] = data.studentLoginId.toString() + } + HebeFilterType.BY_PERIOD -> { + query["periodId"] = data.studentSemesterId.toString() + query["pupilId"] = data.studentId.toString() + } + } + + if (dateFrom != null) + query["dateFrom"] = dateFrom.stringY_m_d + if (dateTo != null) + query["dateTo"] = dateTo.stringY_m_d + + if (folder != null) + query["folder"] = folder.toString() + + val semester1Start = profile?.dateSemester1Start?.inMillis + + query["lastId"] = "-2147483648" // don't ask, it's just Vulcan + query["pageSize"] = "500" + query["lastSyncDate"] = LocalDateTime + .ofInstant( + Instant.ofEpochMilli(lastSync ?: semester1Start ?: 0), + ZoneId.systemDefault() + ) + .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + + apiGet(tag, url, query) { json: JsonArray, response -> + onSuccess(json.map { it.asJsonObject }, response) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt new file mode 100644 index 00000000..d32161a6 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/VulcanWebMain.kt @@ -0,0 +1,315 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-17. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data + +import com.google.gson.JsonArray +import com.google.gson.JsonObject +import com.google.gson.JsonParser +import im.wangchao.mhttp.Request +import im.wangchao.mhttp.Response +import im.wangchao.mhttp.callback.TextCallbackHandler +import pl.droidsonroids.jspoon.Jspoon +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.CufsCertificate +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.utils.Utils +import pl.szczodrzynski.edziennik.utils.models.Date +import java.io.File +import java.net.HttpURLConnection + +open class VulcanWebMain(open val data: DataVulcan, open val lastSync: Long?) { + companion object { + const val TAG = "VulcanWebMain" + const val WEB_MAIN = 0 + const val WEB_OLD = 1 + const val WEB_NEW = 2 + const val WEB_MESSAGES = 3 + const val STATE_SUCCESS = 0 + const val STATE_NO_REGISTER = 1 + const val STATE_LOGGED_OUT = 2 + } + + val profileId + get() = data.profile?.id ?: -1 + + val profile + get() = data.profile + + private val certificateAdapter by lazy { + Jspoon.create().adapter(CufsCertificate::class.java) + } + + fun saveCertificate(xml: String) { + val file = File(data.app.filesDir, "cert_"+(data.webUsername ?: data.webEmail)+".xml") + file.writeText(xml) + } + + fun readCertificate(): String? { + val file = File(data.app.filesDir, "cert_"+(data.webUsername ?: data.webEmail)+".xml") + if (file.canRead()) + return file.readText() + return null + } + + fun parseCertificate(xml: String): CufsCertificate { + val xmlParsed = xml + .replace("<[a-z]+?:".toRegex(), "<") + .replace(" Unit): Boolean { + // check if the certificate is valid + if (Date.fromIso(certificate.expiryDate) < System.currentTimeMillis()) + return false + + val callback = object : TextCallbackHandler() { + override fun onSuccess(text: String?, response: Response?) { + if (response?.headers()?.get("Location")?.contains("LoginEndpoint.aspx") == true + || response?.headers()?.get("Location")?.contains("?logout=true") == true) { + onResult(symbol, STATE_LOGGED_OUT) + return + } + if (text?.contains("LoginEndpoint.aspx?logout=true") == true) { + onResult(symbol, STATE_NO_REGISTER) + return + } + if (!validateCallback(symbol, text, response, jsonResponse = false)) { + return + } + data.webExpiryTime = data.webExpiryTime.toMutableMap().also { map -> + map[symbol] = (Date.fromIso(certificate.expiryDate) / 1000L).toString() + } + onResult(symbol, STATE_SUCCESS) + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + data.error(ApiError(TAG, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + } + + Request.builder() + .url("https://uonetplus.${data.webHost}/$symbol/LoginEndpoint.aspx") + .withClient(data.app.httpLazy) + .userAgent(SYSTEM_USER_AGENT) + .post() + .addParameter("wa", "wsignin1.0") + .addParameter("wctx", certificate.targetUrl) + .addParameter("wresult", certificate.xml) + .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST) + .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN) + .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED) + .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE) + .allowErrorCode(429) + .callback(callback) + .build() + .enqueue() + + return true + } + + fun getStartPage(symbol: String = data.symbol ?: "default", postErrors: Boolean = true, onSuccess: (html: String, schoolSymbols: List) -> Unit) { + val callback = object : TextCallbackHandler() { + override fun onSuccess(text: String?, response: Response?) { + if (!validateCallback(symbol, text, response, jsonResponse = false) || text == null) { + return + } + + if (postErrors) { + when { + text.contains("status absolwenta") -> ERROR_VULCAN_WEB_GRADUATE_ACCOUNT + else -> null + }?.let { errorCode -> + data.error(ApiError(TAG, errorCode) + .withResponse(response) + .withApiResponse(text)) + return + } + } + + data.webPermissions = data.webPermissions.toMutableMap().also { map -> + val permissions = Regexes.VULCAN_WEB_PERMISSIONS.find(text)?.let { it[1] } + if (permissions?.isNotBlank() == true) { + val studentId = permissions.split("|") + .getOrNull(0) + ?.base64DecodeToString() + ?.toJsonObject() + ?.getJsonArray("AuthInfos") + ?.asJsonObjectList() + ?.flatMap { authInfo -> + authInfo.getJsonArray("UczenIds") + ?.map { it.asInt } + ?: listOf() + } + ?.firstOrNull() + ?.toString() + data.app.cookieJar.set( + data.webHost ?: "vulcan.net.pl", + "idBiezacyUczen", + studentId + ) + } + map[symbol] = permissions + } + + val schoolSymbols = mutableListOf() + val clientUrl = "://uonetplus-uczen.${data.webHost}/$symbol/" + var clientIndex = text.indexOf(clientUrl) + var count = 0 + while (clientIndex != -1 && count < 100) { + val startIndex = clientIndex + clientUrl.length + val endIndex = text.indexOfAny(charArrayOf('"', '/'), startIndex = startIndex) + val schoolSymbol = text.substring(startIndex, endIndex) + schoolSymbols += schoolSymbol + clientIndex = text.indexOf(clientUrl, startIndex = endIndex) + count++ + } + schoolSymbols.removeAll { + it.toLowerCase() == "default" + || !it.matches(Regexes.VULCAN_WEB_SYMBOL_VALIDATE) + } + + if (postErrors && schoolSymbols.isEmpty()) { + data.error(ApiError(TAG, ERROR_VULCAN_WEB_NO_SCHOOLS) + .withResponse(response) + .withApiResponse(text)) + return + } + + onSuccess(text, schoolSymbols) + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + data.error(ApiError(TAG, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + } + + Request.builder() + .url("https://uonetplus.${data.webHost}/$symbol/Start.mvc/Index") + .userAgent(SYSTEM_USER_AGENT) + .get() + .allowErrorCode(HttpURLConnection.HTTP_BAD_REQUEST) + .allowErrorCode(HttpURLConnection.HTTP_FORBIDDEN) + .allowErrorCode(HttpURLConnection.HTTP_UNAUTHORIZED) + .allowErrorCode(HttpURLConnection.HTTP_UNAVAILABLE) + .allowErrorCode(429) + .callback(callback) + .build() + .enqueue() + } + + private fun validateCallback(symbol: String, text: String?, response: Response?, jsonResponse: Boolean = true): Boolean { + if (text == null) { + data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) + .withResponse(response)) + return false + } + + if (response?.code() !in 200..302 || (jsonResponse && !text.startsWith("{"))) { + when { + text.contains("The custom error module") -> ERROR_VULCAN_WEB_429 + else -> ERROR_VULCAN_WEB_OTHER + }.let { errorCode -> + data.error(ApiError(TAG, errorCode) + .withApiResponse(text) + .withResponse(response)) + return false + } + } + + val cookies = data.app.cookieJar.getAll(data.webHost ?: "vulcan.net.pl") + val authCookie = cookies["EfebSsoAuthCookie"] + if ((authCookie == null || authCookie == "null") && data.webAuthCookie[symbol] != null) { + data.app.cookieJar.set(data.webHost ?: "vulcan.net.pl", "EfebSsoAuthCookie", data.webAuthCookie[symbol]) + } + else if (authCookie.isNotNullNorBlank() && authCookie != "null" && authCookie != data.webAuthCookie[symbol]) { + data.webAuthCookie = data.webAuthCookie.toMutableMap().also { map -> + map[symbol] = authCookie + } + } + return true + } + + fun webGetJson( + tag: String, + webType: Int, + endpoint: String, + method: Int = POST, + parameters: Map = emptyMap(), + onSuccess: (json: JsonObject, response: Response?) -> Unit + ) { + val url = "https://" + when (webType) { + WEB_MAIN -> "uonetplus" + WEB_OLD -> "uonetplus-opiekun" + WEB_NEW -> "uonetplus-uczen" + WEB_MESSAGES -> "uonetplus-uzytkownik" + else -> "uonetplus" + } + ".${data.webHost}/${data.symbol}/$endpoint" + + Utils.d(tag, "Request: Vulcan/WebMain - $url") + + val payload = JsonObject() + parameters.map { (name, value) -> + when (value) { + is JsonObject -> payload.add(name, value) + is JsonArray -> payload.add(name, value) + is String -> payload.addProperty(name, value) + is Int -> payload.addProperty(name, value) + is Long -> payload.addProperty(name, value) + is Float -> payload.addProperty(name, value) + is Char -> payload.addProperty(name, value) + is Boolean -> payload.addProperty(name, value) + } + } + + val callback = object : TextCallbackHandler() { + override fun onSuccess(text: String?, response: Response?) { + if (!validateCallback(data.symbol ?: "default", text, response)) + return + + try { + val json = JsonParser().parse(text).asJsonObject + onSuccess(json, response) + } catch (e: Exception) { + data.error(ApiError(tag, EXCEPTION_VULCAN_WEB_REQUEST) + .withResponse(response) + .withThrowable(e) + .withApiResponse(text)) + } + } + + override fun onFailure(response: Response?, throwable: Throwable?) { + data.error(ApiError(tag, ERROR_REQUEST_FAILURE) + .withResponse(response) + .withThrowable(throwable)) + } + } + + Request.builder() + .url(url) + .userAgent(SYSTEM_USER_AGENT) + .apply { + when (method) { + GET -> get() + POST -> post() + } + } + .setJsonBody(payload) + .allowErrorCode(429) + .callback(callback) + .build() + .enqueue() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiAttendance.kt deleted file mode 100644 index c2df68a1..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiAttendance.kt +++ /dev/null @@ -1,78 +0,0 @@ -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import androidx.core.util.isEmpty -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_ATTENDANCE -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_ATTENDANCE -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_PRESENT -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.utils.models.Date - -class VulcanApiAttendance(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApiAttendance" - } - - init { data.profile?.also { profile -> - if (data.attendanceTypes.isEmpty()) { - data.db.attendanceTypeDao().getAllNow(profileId).toSparseArray(data.attendanceTypes) { it.id } - } - - val startDate: String = profile.getSemesterStart(profile.currentSemester).stringY_m_d - val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d - - apiGet(TAG, VULCAN_API_ENDPOINT_ATTENDANCE, parameters = mapOf( - "DataPoczatkowa" to startDate, - "DataKoncowa" to endDate, - "IdOddzial" to data.studentClassId, - "IdUczen" to data.studentId, - "IdOkresKlasyfikacyjny" to data.studentSemesterId - )) { json, _ -> - json.getJsonObject("Data")?.getJsonArray("Frekwencje")?.forEach { attendanceEl -> - val attendance = attendanceEl.asJsonObject - - val attendanceCategory = data.attendanceTypes.get(attendance.getLong("IdKategoria") ?: return@forEach) - ?: return@forEach - - val type = attendanceCategory.type - - val id = (attendance.getInt("Dzien") ?: 0) + (attendance.getInt("Numer") ?: 0) - - val lessonDateMillis = Date.fromY_m_d(attendance.getString("DzienTekst")).inMillis - val lessonDate = Date.fromMillis(lessonDateMillis) - - val lessonSemester = profile.dateToSemester(lessonDate) - - val attendanceObject = Attendance( - profileId, - id.toLong(), - -1, - attendance.getLong("IdPrzedmiot") ?: -1, - lessonSemester, - attendance.getString("PrzedmiotNazwa") + attendanceCategory.name.let { " - $it" }, - lessonDate, - data.lessonRanges.get(attendance.getInt("Numer") ?: 0)?.startTime, - type) - - data.attendanceList.add(attendanceObject) - if (attendanceObject.type != TYPE_PRESENT) { - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_ATTENDANCE, - attendanceObject.id, - profile.empty, - profile.empty, - attendanceObject.lessonDate.combineWith(attendanceObject.startTime) - )) - } - } - - data.setSyncNext(ENDPOINT_VULCAN_API_ATTENDANCE, SYNC_ALWAYS) - onSuccess() - } - } ?: onSuccess()} -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiDictionaries.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiDictionaries.kt deleted file mode 100644 index b5ef18e1..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiDictionaries.kt +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-10-20 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_DICTIONARIES -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_DICTIONARIES -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance -import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceType -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange -import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType -import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject -import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher -import pl.szczodrzynski.edziennik.utils.models.Time - -class VulcanApiDictionaries(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApiDictionaries" - } - - init { - apiGet(TAG, VULCAN_API_ENDPOINT_DICTIONARIES) { json, _ -> - val elements = json.getJsonObject("Data") - - elements?.getJsonArray("Pracownicy")?.forEach { saveTeacher(it.asJsonObject) } - elements?.getJsonArray("Przedmioty")?.forEach { saveSubject(it.asJsonObject) } - elements?.getJsonArray("PoryLekcji")?.forEach { saveLessonRange(it.asJsonObject) } - elements?.getJsonArray("KategorieOcen")?.forEach { saveGradeCategory(it.asJsonObject) } - elements?.getJsonArray("KategorieUwag")?.forEach { saveNoticeType(it.asJsonObject) } - elements?.getJsonArray("KategorieFrekwencji")?.forEach { saveAttendanceType(it.asJsonObject) } - - data.setSyncNext(ENDPOINT_VULCAN_API_DICTIONARIES, 4 * DAY) - onSuccess() - } - } - - private fun saveTeacher(teacher: JsonObject) { - val id = teacher.getLong("Id") ?: return - val name = teacher.getString("Imie") ?: "" - val surname = teacher.getString("Nazwisko") ?: "" - val loginId = teacher.getString("LoginId") ?: "-1" - - val teacherObject = Teacher( - profileId, - id, - name, - surname, - loginId - ) - - data.teacherList.put(id, teacherObject) - } - - private fun saveSubject(subject: JsonObject) { - val id = subject.getLong("Id") ?: return - val longName = subject.getString("Nazwa") ?: "" - val shortName = subject.getString("Kod") ?: "" - - val subjectObject = Subject( - profileId, - id, - longName, - shortName - ) - - data.subjectList.put(id, subjectObject) - } - - private fun saveLessonRange(lessonRange: JsonObject) { - val lessonNumber = lessonRange.getInt("Numer") ?: return - val startTime = lessonRange.getString("PoczatekTekst")?.let { Time.fromH_m(it) } ?: return - val endTime = lessonRange.getString("KoniecTekst")?.let { Time.fromH_m(it) } ?: return - - val lessonRangeObject = LessonRange( - profileId, - lessonNumber, - startTime, - endTime - ) - - data.lessonRanges.put(lessonNumber, lessonRangeObject) - } - - private fun saveGradeCategory(gradeCategory: JsonObject) { - val id = gradeCategory.getLong("Id") ?: return - val name = gradeCategory.getString("Nazwa") ?: "" - - val gradeCategoryObject = GradeCategory( - profileId, - id, - 0.0f, - -1, - name - ) - - data.gradeCategories.put(id, gradeCategoryObject) - } - - private fun saveNoticeType(noticeType: JsonObject) { - val id = noticeType.getLong("Id") ?: return - val name = noticeType.getString("Nazwa") ?: "" - - val noticeTypeObject = NoticeType( - profileId, - id, - name - ) - - data.noticeTypes.put(id, noticeTypeObject) - } - - private fun saveAttendanceType(attendanceType: JsonObject) { - val id = attendanceType.getLong("Id") ?: return - val name = attendanceType.getString("Nazwa") ?: "" - - val absent = attendanceType.getBoolean("Nieobecnosc") ?: false - val excused = attendanceType.getBoolean("Usprawiedliwione") ?: false - val type = if (absent) { - if (excused) - Attendance.TYPE_ABSENT_EXCUSED - else - Attendance.TYPE_ABSENT - } else { - val belated = attendanceType.getBoolean("Spoznienie") ?: false - val released = attendanceType.getBoolean("Zwolnienie") ?: false - val present = attendanceType.getBoolean("Obecnosc") ?: true - if (belated) - if (excused) - Attendance.TYPE_ABSENT_EXCUSED - else - Attendance.TYPE_ABSENT - else if (released) - Attendance.TYPE_RELEASED - else if (present) - Attendance.TYPE_PRESENT - else - Attendance.TYPE_CUSTOM - } - - val attendanceTypeObject = AttendanceType( - profileId, - id, - name, - type, - -1 - ) - - data.attendanceTypes.put(id, attendanceTypeObject) - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiEvents.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiEvents.kt deleted file mode 100644 index 045c80f7..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiEvents.kt +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-10-20 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_EVENTS -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_HOMEWORK -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_EVENTS -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_HOMEWORK -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.getBoolean -import pl.szczodrzynski.edziennik.getJsonArray -import pl.szczodrzynski.edziennik.getLong -import pl.szczodrzynski.edziennik.getString -import pl.szczodrzynski.edziennik.utils.models.Date - -class VulcanApiEvents(override val data: DataVulcan, private val isHomework: Boolean, val onSuccess: () -> Unit) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApiEvents" - } - - init { data.profile?.also { profile -> - - val startDate: String = when (profile.empty) { - true -> profile.getSemesterStart(profile.currentSemester).stringY_m_d - else -> Date.getToday().stepForward(0, -1, 0).stringY_m_d - } - val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d - - val endpoint = when (isHomework) { - true -> VULCAN_API_ENDPOINT_HOMEWORK - else -> VULCAN_API_ENDPOINT_EVENTS - } - apiGet(TAG, endpoint, parameters = mapOf( - "DataPoczatkowa" to startDate, - "DataKoncowa" to endDate, - "IdOddzial" to data.studentClassId, - "IdUczen" to data.studentId, - "IdOkresKlasyfikacyjny" to data.studentSemesterId - )) { json, _ -> - val events = json.getJsonArray("Data") - - events?.forEach { eventEl -> - val event = eventEl.asJsonObject - - val id = event?.getLong("Id") ?: return@forEach - val eventDate = Date.fromY_m_d(event.getString("DataTekst") ?: return@forEach) - val subjectId = event.getLong("IdPrzedmiot") ?: -1 - val teacherId = event.getLong("IdPracownik") ?: -1 - val topic = event.getString("Opis") ?: "" - - val lessonList = data.db.timetableDao().getForDateNow(profileId, eventDate) - val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime - - val type = when (isHomework) { - true -> Event.TYPE_HOMEWORK - else -> when (event.getBoolean("Rodzaj")) { - false -> Event.TYPE_SHORT_QUIZ - else -> Event.TYPE_EXAM - } - } - val teamId = event.getLong("IdOddzial") ?: data.teamClass?.id ?: -1 - - val eventObject = Event( - profileId, - id, - eventDate, - startTime, - topic, - -1, - type, - false, - teacherId, - subjectId, - teamId - ) - - data.eventList.add(eventObject) - data.metadataList.add(Metadata( - profileId, - if (isHomework) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT, - id, - profile.empty, - profile.empty, - System.currentTimeMillis() - )) - } - - when (isHomework) { - true -> { - data.toRemove.add(DataRemoveModel.Events.futureWithType(Event.TYPE_HOMEWORK)) - data.setSyncNext(ENDPOINT_VULCAN_API_HOMEWORK, SYNC_ALWAYS) - } - false -> { - data.toRemove.add(DataRemoveModel.Events.futureExceptType(Event.TYPE_HOMEWORK)) - data.setSyncNext(ENDPOINT_VULCAN_API_EVENTS, SYNC_ALWAYS) - } - } - onSuccess() - } - } ?: onSuccess()} -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiGrades.kt deleted file mode 100644 index d86d530a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiGrades.kt +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-10-19 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_GRADES -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_GRADES -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import java.text.DecimalFormat -import kotlin.math.roundToInt - -class VulcanApiGrades(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApiGrades" - } - - init { data.profile?.also { profile -> - - apiGet(TAG, VULCAN_API_ENDPOINT_GRADES, parameters = mapOf( - "IdUczen" to data.studentId, - "IdOkresKlasyfikacyjny" to data.studentSemesterId - )) { json, _ -> - val grades = json.getJsonArray("Data") - - grades?.forEach { gradeEl -> - val grade = gradeEl.asJsonObject - - val id = grade.getLong("Id") ?: return@forEach - val categoryId = grade.getLong("IdKategoria") ?: -1 - val category = data.gradeCategories.singleOrNull{ it.categoryId == categoryId }?.text - ?: "" - val teacherId = grade.getLong("IdPracownikD") ?: -1 - val subjectId = grade.getLong("IdPrzedmiot") ?: -1 - val description = grade.getString("Opis") - val comment = grade.getString("Komentarz") - var value = grade.getFloat("Wartosc") - var weight = grade.getFloat("WagaOceny") ?: 0.0f - val modificatorValue = grade.getFloat("WagaModyfikatora") - val numerator = grade.getFloat("Licznik") - val denominator = grade.getFloat("Mianownik") - val addedDate = (grade.getLong("DataModyfikacji") ?: return@forEach) * 1000 - - var finalDescription = "" - - var name = when (numerator != null && denominator != null) { - true -> { - value = numerator / denominator - finalDescription += DecimalFormat("#.##").format(numerator) + - "/" + DecimalFormat("#.##").format(denominator) - weight = 0.0f - (value * 100).roundToInt().toString() + "%" - } - else -> { - if (value != null) modificatorValue?.also { value += it } - else weight = 0.0f - - grade.getString("Wpis") ?: "" - } - } - - comment?.also { - if (name == "") name = it - else finalDescription = (if (finalDescription == "") "" else " ") + it - } - - description?.also { - finalDescription = (if (finalDescription == "") "" else " - ") + it - } - - val color = when (name) { - "1-", "1", "1+" -> 0xffd65757 - "2-", "2", "2+" -> 0xff9071b3 - "3-", "3", "3+" -> 0xffd2ab24 - "4-", "4", "4+" -> 0xff50b6d6 - "5-", "5", "5+" -> 0xff2cbd92 - "6-", "6", "6+" -> 0xff91b43c - else -> 0xff3D5F9C - }.toInt() - - val gradeObject = Grade( - profileId, - id, - category, - color, - finalDescription, - name, - value ?: 0.0f, - weight, - data.studentSemesterNumber, - teacherId, - subjectId - ) - - data.gradeList.add(gradeObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_GRADE, - id, - profile.empty, - profile.empty, - addedDate - - )) - } - - data.setSyncNext(ENDPOINT_VULCAN_API_GRADES, SYNC_ALWAYS) - onSuccess() - } - } ?: onSuccess()} -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesChangeStatus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesChangeStatus.kt deleted file mode 100644 index 435c1d27..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesChangeStatus.kt +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-11-12 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata - -class VulcanApiMessagesChangeStatus( - override val data: DataVulcan, - private val messageObject: MessageFull, - val onSuccess: () -> Unit -) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApiMessagesChangeStatus" - } - - init { - data.profile?.also { profile -> - apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_CHANGE_STATUS, parameters = mapOf( - "WiadomoscId" to messageObject.id, - "FolderWiadomosci" to "Odebrane", - "Status" to "Widoczna", - "LoginId" to data.studentLoginId, - "IdUczen" to data.studentId - )) { _, _ -> - - if (!messageObject.seen) { - data.messageMetadataList.add(Metadata( - profileId, - Metadata.TYPE_MESSAGE, - messageObject.id, - true, - true, - messageObject.addedDate - )) - } - - if (messageObject.type != TYPE_SENT) { - val messageRecipientObject = MessageRecipient( - profileId, - -1, - -1, - System.currentTimeMillis(), - messageObject.id - ) - - data.messageRecipientList.add(messageRecipientObject) - } - - onSuccess() - } - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesInbox.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesInbox.kt deleted file mode 100644 index dac68ecb..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesInbox.kt +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-11-01 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_RECEIVED -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_MESSAGES_INBOX -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher -import pl.szczodrzynski.edziennik.utils.Utils -import pl.szczodrzynski.edziennik.utils.models.Date - -class VulcanApiMessagesInbox(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApiMessagesInbox" - } - - init { - data.profile?.also { profile -> - - val startDate: String = when (profile.empty) { - true -> profile.getSemesterStart(profile.currentSemester).stringY_m_d - else -> Date.getToday().stepForward(0, -1, 0).stringY_m_d - } - val endDate: String = profile.getSemesterEnd(profile.currentSemester).stringY_m_d - - apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_RECEIVED, parameters = mapOf( - "DataPoczatkowa" to startDate, - "DataKoncowa" to endDate, - "LoginId" to data.studentLoginId, - "IdUczen" to data.studentId - )) { json, _ -> - json.getJsonArray("Data").asJsonObjectList()?.forEach { message -> - val id = message.getLong("WiadomoscId") ?: return@forEach - val subject = message.getString("Tytul") ?: "" - val body = message.getString("Tresc") ?: "" - - val senderLoginId = message.getString("NadawcaId") ?: return@forEach - val senderId = data.teacherList - .singleOrNull { it.loginId == senderLoginId }?.id ?: { - - val senderName = message.getString("Nadawca") ?: "" - - senderName.getLastFirstName()?.let { (senderLastName, senderFirstName) -> - val teacherObject = Teacher( - profileId, - -1 * Utils.crc16(senderName.toByteArray()).toLong(), - senderFirstName, - senderLastName, - senderLoginId - ) - data.teacherList.put(teacherObject.id, teacherObject) - teacherObject.id - } - }.invoke() ?: -1 - - val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 } - ?: -1 - val readDate = message.getLong("DataPrzeczytaniaUnixEpoch")?.let { it * 1000 } - ?: -1 - - val messageObject = Message( - profileId, - id, - subject, - body, - TYPE_RECEIVED, - senderId, - -1 - ) - - val messageRecipientObject = MessageRecipient( - profileId, - -1, - -1, - readDate, - id - ) - - data.messageIgnoreList.add(messageObject) - data.messageRecipientList.add(messageRecipientObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_MESSAGE, - id, - readDate > 0, - readDate > 0, - sentDate - )) - } - - data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_INBOX, SYNC_ALWAYS) - onSuccess() - } - } ?: onSuccess() - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesSent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesSent.kt deleted file mode 100644 index 0cc03534..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiMessagesSent.kt +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-11-5 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_MESSAGES_SENT -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_MESSAGES_SENT -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher -import pl.szczodrzynski.edziennik.utils.Utils -import pl.szczodrzynski.edziennik.utils.models.Date - -class VulcanApiMessagesSent(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApiMessagesSent" - } - - init { - data.profile?.also { profile -> - val startDate: Long = when (profile.empty) { - true -> profile.getSemesterStart(profile.currentSemester).inUnix - else -> Date.getToday().stepForward(0, -1, 0).inUnix - } - val endDate: Long = profile.getSemesterEnd(profile.currentSemester).inUnix - - apiGet(TAG, VULCAN_API_ENDPOINT_MESSAGES_SENT, parameters = mapOf( - "DataPoczatkowa" to startDate, - "DataKoncowa" to endDate, - "LoginId" to data.studentLoginId, - "IdUczen" to data.studentId - )) { json, _ -> - json.getJsonArray("Data")?.asJsonObjectList()?.forEach { message -> - val id = message.getLong("WiadomoscId") ?: return@forEach - val subject = message.getString("Tytul") ?: "" - val body = message.getString("Tresc") ?: "" - val readBy = message.getInt("Przeczytane") ?: 0 - val unreadBy = message.getInt("Nieprzeczytane") ?: 0 - val sentDate = message.getLong("DataWyslaniaUnixEpoch")?.let { it * 1000 } ?: -1 - - message.getJsonArray("Adresaci")?.asJsonObjectList() - ?.onEach { receiver -> - - val receiverLoginId = receiver.getString("LoginId") - ?: return@onEach - val receiverId = data.teacherList.singleOrNull { it.loginId == receiverLoginId }?.id - ?: { - val receiverName = receiver.getString("Nazwa") ?: "" - - receiverName.getLastFirstName()?.let { (receiverLastName, receiverFirstName) -> - val teacherObject = Teacher( - profileId, - -1 * Utils.crc16(receiverName.toByteArray()).toLong(), - receiverFirstName, - receiverLastName, - receiverLoginId - ) - data.teacherList.put(teacherObject.id, teacherObject) - teacherObject.id - } - }.invoke() ?: -1 - - val readDate: Long = when (readBy) { - 0 -> 0 - else -> when (unreadBy) { - 0 -> 1 - else -> -1 - } - } - - val messageRecipientObject = MessageRecipient( - profileId, - receiverId, - -1, - readDate, - id - ) - - data.messageRecipientList.add(messageRecipientObject) - } - - val messageObject = Message( - profileId, - id, - subject, - body, - TYPE_SENT, - -1, - -1 - ) - - data.messageIgnoreList.add(messageObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_MESSAGE, - id, - true, - true, - sentDate - )) - } - - data.setSyncNext(ENDPOINT_VULCAN_API_MESSAGES_SENT, 1 * DAY, DRAWER_ITEM_MESSAGES) - onSuccess() - } - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiNotices.kt deleted file mode 100644 index eebe6c29..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiNotices.kt +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-10-23 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import androidx.core.util.isEmpty -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_NOTICES -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_NOTICES -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice -import pl.szczodrzynski.edziennik.getJsonArray -import pl.szczodrzynski.edziennik.getLong -import pl.szczodrzynski.edziennik.getString -import pl.szczodrzynski.edziennik.toSparseArray -import pl.szczodrzynski.edziennik.utils.models.Date - -class VulcanApiNotices(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApiNotices" - } - - init { data.profile?.also { profile -> - if (data.noticeTypes.isEmpty()) { - data.db.noticeTypeDao().getAllNow(profileId).toSparseArray(data.noticeTypes) { it.id } - } - - apiGet(TAG, VULCAN_API_ENDPOINT_NOTICES, parameters = mapOf( - "IdUczen" to data.studentId, - "IdOkresKlasyfikacyjny" to data.studentSemesterId - )) { json, _ -> - json.getJsonArray("Data")?.forEach { noticeEl -> - val notice = noticeEl.asJsonObject - - val id = notice.getLong("Id") ?: return@forEach - val text = notice.getString("TrescUwagi") ?: return@forEach - val teacherId = notice.getLong("IdPracownik") ?: -1 - val addedDate = Date.fromY_m_d(notice.getString("DataWpisuTekst")).inMillis - - val noticeObject = Notice( - profileId, - id, - text, - profile.currentSemester, - Notice.TYPE_NEUTRAL, - teacherId - ) - - data.noticeList.add(noticeObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_NOTICE, - id, - profile.empty, - profile.empty, - addedDate - )) - } - - data.setSyncNext(ENDPOINT_VULCAN_API_NOTICES, SYNC_ALWAYS) - onSuccess() - } - } ?: onSuccess()} -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiProposedGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiProposedGrades.kt deleted file mode 100644 index c647af2b..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiProposedGrades.kt +++ /dev/null @@ -1,81 +0,0 @@ -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import com.google.gson.JsonArray -import pl.szczodrzynski.edziennik.HOUR -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_GRADES_SUMMARY -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.asJsonObjectList -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.getJsonArray -import pl.szczodrzynski.edziennik.getJsonObject -import pl.szczodrzynski.edziennik.utils.Utils - -class VulcanApiProposedGrades(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApiProposedGrades" - } - - init { data.profile?.also { profile -> - - apiGet(TAG, VULCAN_API_ENDPOINT_GRADES_PROPOSITIONS, parameters = mapOf( - "IdUczen" to data.studentId, - "IdOkresKlasyfikacyjny" to data.studentSemesterId - )) { json, _ -> - val grades = json.getJsonObject("Data") - - grades.getJsonArray("OcenyPrzewidywane")?.let { - processGradeList(it, isFinal = false) - } - - grades.getJsonArray("OcenyKlasyfikacyjne")?.let { - processGradeList(it, isFinal = true) - } - - data.setSyncNext(ENDPOINT_VULCAN_API_GRADES_SUMMARY, 6*HOUR) - onSuccess() - } - } ?: onSuccess()} - - private fun processGradeList(grades: JsonArray, isFinal: Boolean) { - grades.asJsonObjectList()?.forEach { grade -> - val name = grade.get("Wpis").asString - val value = Utils.getGradeValue(name) - val subjectId = grade.get("IdPrzedmiot").asLong - - val id = subjectId * -100 - data.studentSemesterNumber - - val color = Utils.getVulcanGradeColor(name) - - val gradeObject = Grade( - profileId, - id, - "", - color, - "", - name, - value, - 0f, - data.studentSemesterNumber, - -1, - subjectId - ) - if (data.studentSemesterNumber == 1) { - gradeObject.type = if (isFinal) Grade.TYPE_SEMESTER1_FINAL else Grade.TYPE_SEMESTER1_PROPOSED - } else { - gradeObject.type = if (isFinal) Grade.TYPE_SEMESTER2_FINAL else Grade.TYPE_SEMESTER2_PROPOSED - } - data.gradeList.add(gradeObject) - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_GRADE, - gradeObject.id, - data.profile?.empty ?: false, - data.profile?.empty ?: false, - System.currentTimeMillis() - )) - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTemplate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTemplate.kt deleted file mode 100644 index adda3dd0..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTemplate.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-10-20 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi - -class VulcanApiTemplate(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApi" - } - - init { - /* data.profile?.also { profile -> - apiGet(TAG, VULCAN_API_ENDPOINT_) { json, _ -> - - data.setSyncNext(ENDPOINT_VULCAN_API_, SYNC_ALWAYS) - onSuccess() - } - } */ - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTimetable.kt deleted file mode 100644 index 41badfeb..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/api/VulcanApiTimetable.kt +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-11-13 - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.api - -import androidx.core.util.set -import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.Regexes -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_TIMETABLE -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_API_TIMETABLE -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel -import pl.szczodrzynski.edziennik.data.db.modules.api.SYNC_ALWAYS -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team -import pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson -import pl.szczodrzynski.edziennik.utils.Utils.crc16 -import pl.szczodrzynski.edziennik.utils.Utils.d -import pl.szczodrzynski.edziennik.utils.models.Date -import pl.szczodrzynski.edziennik.utils.models.Week - -class VulcanApiTimetable(override val data: DataVulcan, val onSuccess: () -> Unit) : VulcanApi(data) { - companion object { - const val TAG = "VulcanApiTimetable" - } - - init { data.profile?.also { profile -> - val currentWeekStart = Week.getWeekStart() - - if (Date.getToday().weekDay > 4) { - currentWeekStart.stepForward(0, 0, 7) - } - - val getDate = data.arguments?.getString("weekStart") ?: currentWeekStart.stringY_m_d - - val weekStart = Date.fromY_m_d(getDate) - val weekEnd = weekStart.clone().stepForward(0, 0, 6) - - apiGet(TAG, VULCAN_API_ENDPOINT_TIMETABLE, parameters = mapOf( - "DataPoczatkowa" to weekStart.stringY_m_d, - "DataKoncowa" to weekEnd.stringY_m_d, - "IdUczen" to data.studentId, - "IdOddzial" to data.studentClassId, - "IdOkresKlasyfikacyjny" to data.studentSemesterId - )) { json, _ -> - val dates = mutableSetOf() - val lessons = mutableListOf() - - json.getJsonArray("Data")?.asJsonObjectList()?.forEach { lesson -> - if (lesson.getBoolean("PlanUcznia") != true) - return@forEach - val lessonDate = Date.fromY_m_d(lesson.getString("DzienTekst")) - val lessonNumber = lesson.getInt("NumerLekcji") - val lessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == lessonNumber } - val startTime = lessonRange?.startTime - val endTime = lessonRange?.endTime - val teacherId = lesson.getLong("IdPracownik") - val classroom = lesson.getString("Sala") - - val oldTeacherId = lesson.getLong("IdPracownikOld") - - val changeAnnotation = lesson.getString("AdnotacjaOZmianie") ?: "" - val type = when { - changeAnnotation.startsWith("(przeniesiona z") -> Lesson.TYPE_SHIFTED_TARGET - changeAnnotation.startsWith("(przeniesiona na") -> Lesson.TYPE_SHIFTED_SOURCE - changeAnnotation.startsWith("(zastępstwo") -> Lesson.TYPE_CHANGE - lesson.getBoolean("PrzekreslonaNazwa") == true -> Lesson.TYPE_CANCELLED - else -> Lesson.TYPE_NORMAL - } - - val teamId = lesson.getString("PodzialSkrot")?.let { teamName -> - val name = "${data.teamClass?.name} $teamName" - val id = name.crc16().toLong() - var team = data.teamList.singleOrNull { it.name == name } - if (team == null) { - team = Team( - profileId, - id, - name, - Team.TYPE_VIRTUAL, - "${data.schoolName}:$name", - teacherId ?: oldTeacherId ?: -1 - ) - data.teamList[id] = team - } - team.id - } ?: data.studentClassId.toLong() - - val subjectId = lesson.getLong("IdPrzedmiot")?.let { - when (it) { - 0L -> { - val subjectName = lesson.getString("PrzedmiotNazwa") ?: "" - - data.subjectList.singleOrNull { subject -> subject.longName == subjectName }?.id - ?: { - /** - * CREATE A NEW SUBJECT IF IT DOESN'T EXIST - */ - - val subjectObject = Subject( - profileId, - -1 * crc16(subjectName.toByteArray()).toLong(), - subjectName, - subjectName - ) - data.subjectList.put(subjectObject.id, subjectObject) - subjectObject.id - }.invoke() - } - else -> it - } - } - - val lessonObject = Lesson(profileId, -1).apply { - this.type = type - - when (type) { - Lesson.TYPE_NORMAL, Lesson.TYPE_CHANGE, Lesson.TYPE_SHIFTED_TARGET -> { - this.date = lessonDate - this.lessonNumber = lessonNumber - this.startTime = startTime - this.endTime = endTime - this.subjectId = subjectId - this.teacherId = teacherId - this.teamId = teamId - this.classroom = classroom - - this.oldTeacherId = oldTeacherId - } - - Lesson.TYPE_CANCELLED, Lesson.TYPE_SHIFTED_SOURCE -> { - this.oldDate = lessonDate - this.oldLessonNumber = lessonNumber - this.oldStartTime = startTime - this.oldEndTime = endTime - this.oldSubjectId = subjectId - this.oldTeacherId = teacherId - this.oldTeamId = teamId - this.oldClassroom = classroom - } - } - - if (type == Lesson.TYPE_SHIFTED_SOURCE || type == Lesson.TYPE_SHIFTED_TARGET) { - val shift = Regexes.VULCAN_SHITFT_ANNOTATION.find(changeAnnotation) - val oldLessonNumber = shift?.get(2)?.toInt() - val oldLessonDate = shift?.get(3)?.let { Date.fromd_m_Y(it) } - - val oldLessonRange = data.lessonRanges.singleOrNull { it.lessonNumber == oldLessonNumber } - val oldStartTime = oldLessonRange?.startTime - val oldEndTime = oldLessonRange?.endTime - - when (type) { - Lesson.TYPE_SHIFTED_SOURCE -> { - this.lessonNumber = oldLessonNumber - this.date = oldLessonDate - this.startTime = oldStartTime - this.endTime = oldEndTime - } - - Lesson.TYPE_SHIFTED_TARGET -> { - this.oldLessonNumber = oldLessonNumber - this.oldDate = oldLessonDate - this.oldStartTime = oldStartTime - this.oldEndTime = oldEndTime - } - } - } - - this.id = buildId() - } - - val seen = profile.empty || lessonDate < Date.getToday() - - if (type != Lesson.TYPE_NORMAL) { - data.metadataList.add(Metadata( - profileId, - Metadata.TYPE_LESSON_CHANGE, - lessonObject.id, - seen, - seen, - System.currentTimeMillis() - )) - } - - dates.add(lessonDate.value) - lessons.add(lessonObject) - } - - val date: Date = weekStart.clone() - while (date <= weekEnd) { - if (!dates.contains(date.value)) { - lessons.add(Lesson(profileId, date.value.toLong()).apply { - this.type = Lesson.TYPE_NO_LESSONS - this.date = date.clone() - }) - } - - date.stepForward(0, 0, 1) - } - - d(TAG, "Clearing lessons between ${weekStart.stringY_m_d} and ${weekEnd.stringY_m_d} - timetable downloaded for $getDate") - - data.lessonNewList.addAll(lessons) - data.toRemove.add(DataRemoveModel.Timetable.between(weekStart, weekEnd)) - - data.setSyncNext(ENDPOINT_VULCAN_API_TIMETABLE, SYNC_ALWAYS) - onSuccess() - } - }} -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/HebeFilterType.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/HebeFilterType.kt new file mode 100644 index 00000000..a4ea84b1 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/HebeFilterType.kt @@ -0,0 +1,11 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-20. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +enum class HebeFilterType(val endpoint: String) { + BY_PUPIL("byPupil"), + BY_PERSON("byPerson"), + BY_PERIOD("byPeriod") +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAddressbook.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAddressbook.kt new file mode 100644 index 00000000..5069838e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAddressbook.kt @@ -0,0 +1,122 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-21. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import androidx.core.util.set +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_ADDRESSBOOK +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_ADDRESSBOOK +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_EDUCATOR +import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_OTHER +import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_PARENT +import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_PARENTS_COUNCIL +import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_STUDENT +import pl.szczodrzynski.edziennik.data.db.entity.Teacher.Companion.TYPE_TEACHER +import kotlin.text.replace + +class VulcanHebeAddressbook( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + companion object { + const val TAG = "VulcanHebeAddressbook" + } + + private fun String.removeUnitName(unitName: String?): String { + return (unitName ?: data.schoolShort)?.let { + this.replace("($it)", "").trim() + } ?: this + } + + init { + apiGetList( + TAG, + VULCAN_HEBE_ENDPOINT_ADDRESSBOOK, + HebeFilterType.BY_PERSON, + lastSync = lastSync, + includeFilterType = false + ) { list, _ -> + list.forEach { person -> + val id = person.getString("Id") ?: return@forEach + val loginId = person.getString("LoginId") ?: return@forEach + + val idType = id.split("-") + .getOrNull(0) + val idLong = id.split("-") + .getOrNull(1) + ?.toLongOrNull() + ?: return@forEach + + val typeBase = when (idType) { + "e" -> TYPE_TEACHER + "c" -> TYPE_PARENT + "p" -> TYPE_STUDENT + else -> TYPE_OTHER + } + + val name = person.getString("Name") ?: "" + val surname = person.getString("Surname") ?: "" + val namePrefix = "$surname $name - " + + val teacher = data.teacherList[idLong] ?: Teacher( + data.profileId, + idLong, + name, + surname, + loginId + ).also { + data.teacherList[idLong] = it + } + + person.getJsonArray("Roles")?.asJsonObjectList()?.onEach { role -> + var roleText: String? = null + val unitName = role.getString("ConstituentUnitSymbol") + + val personType = when (role.getInt("RoleOrder")) { + 0 -> { /* Wychowawca */ + roleText = role.getString("ClassSymbol") + ?.removeUnitName(unitName) + TYPE_EDUCATOR + } + 1 -> TYPE_TEACHER /* Nauczyciel */ + 2 -> return@onEach /* Pracownik */ + 3 -> { /* Rada rodziców */ + roleText = role.getString("Address") + ?.removeUnitName(unitName) + ?.removePrefix(namePrefix) + ?.trim() + TYPE_PARENTS_COUNCIL + } + 5 -> { + roleText = role.getString("RoleName") + ?.plus(" - ") + ?.plus( + role.getString("Address") + ?.removeUnitName(unitName) + ?.removePrefix(namePrefix) + ?.trim() + ) + TYPE_STUDENT + } + else -> TYPE_OTHER + } + + teacher.setTeacherType(personType) + teacher.typeDescription = roleText + } + + if (teacher.type == 0) + teacher.setTeacherType(typeBase) + } + + data.setSyncNext(ENDPOINT_VULCAN_HEBE_ADDRESSBOOK, 2 * DAY) + onSuccess(ENDPOINT_VULCAN_HEBE_ADDRESSBOOK) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAttendance.kt new file mode 100644 index 00000000..b3ebafa4 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeAttendance.kt @@ -0,0 +1,144 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2021-2-21 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_ATTENDANCE +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_ATTENDANCE +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS + +class VulcanHebeAttendance( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + + companion object { + const val TAG = "VulcanHebeAttendance" + } + + init { + val semesterNumber = data.studentSemesterNumber + val startDate = profile?.getSemesterStart(semesterNumber) + val endDate = profile?.getSemesterEnd(semesterNumber) + + apiGetList( + TAG, + VULCAN_HEBE_ENDPOINT_ATTENDANCE, + HebeFilterType.BY_PUPIL, + dateFrom = startDate, + dateTo = endDate, + lastSync = lastSync + ) { list, _ -> + list.forEach { attendance -> + val id = attendance.getLong("Id") ?: return@forEach + val type = attendance.getJsonObject("PresenceType") ?: return@forEach + val baseType = getBaseType(type) + val typeName = type.getString("Name") ?: return@forEach + val typeCategoryId = type.getLong("CategoryId") ?: return@forEach + val typeSymbol = type.getString("Symbol") ?: return@forEach + val typeShort = when (typeCategoryId.toInt()) { + 6, 8 -> typeSymbol + else -> data.app.attendanceManager.getTypeShort(baseType) + } + val typeColor = when (typeCategoryId.toInt()) { + 1 -> 0xffffffff // obecność + 2 -> 0xffffa687 // nieobecność + 3 -> 0xfffcc150 // nieobecność usprawiedliwiona + 4 -> 0xffede049 // spóźnienie + 5 -> 0xffbbdd5f // spóźnienie usprawiedliwione + 6 -> 0xffa9c9fd // nieobecny z przyczyn szkolnych + 7 -> 0xffddbbe5 // zwolniony + 8 -> 0xffffffff // usunięty wpis + else -> null + }?.toInt() + val date = getDate(attendance, "Day") ?: return@forEach + val lessonRange = getLessonRange(attendance, "TimeSlot") + val startTime = lessonRange?.startTime + val semester = profile?.dateToSemester(date) ?: return@forEach + val teacherId = attendance.getJsonObject("TeacherPrimary")?.getLong("Id") ?: -1 + val subjectId = attendance.getJsonObject("Subject")?.getLong("Id") ?: -1 + val addedDate = getDateTime(attendance, "DateModify") + val lessonNumber = lessonRange?.lessonNumber + val isCounted = attendance.getBoolean("CalculatePresence") + ?: (baseType != Attendance.TYPE_RELEASED) + + val attendanceObject = Attendance( + profileId = profileId, + id = id, + baseType = baseType, + typeName = typeName, + typeShort = typeShort, + typeSymbol = typeSymbol, + typeColor = typeColor, + date = date, + startTime = startTime, + semester = semester, + teacherId = teacherId, + subjectId = subjectId, + addedDate = addedDate + ).also { + it.lessonTopic = attendance.getString("Topic") + it.lessonNumber = lessonNumber + it.isCounted = isCounted + } + + data.attendanceList.add(attendanceObject) + if (baseType != Attendance.TYPE_PRESENT) { + data.metadataList.add( + Metadata( + profileId, + Metadata.TYPE_ATTENDANCE, + attendanceObject.id, + profile?.empty ?: true + || baseType == Attendance.TYPE_PRESENT_CUSTOM + || baseType == Attendance.TYPE_UNKNOWN, + profile?.empty ?: true + || baseType == Attendance.TYPE_PRESENT_CUSTOM + || baseType == Attendance.TYPE_UNKNOWN + ) + ) + } + } + + data.setSyncNext(ENDPOINT_VULCAN_HEBE_ATTENDANCE, SYNC_ALWAYS) + onSuccess(ENDPOINT_VULCAN_HEBE_ATTENDANCE) + } + } + + fun getBaseType(attendanceType: JsonObject): Int { + val absent = attendanceType.getBoolean("Absence") ?: false + val excused = attendanceType.getBoolean("AbsenceJustified") ?: false + return if (absent) { + if (excused) + Attendance.TYPE_ABSENT_EXCUSED + else + Attendance.TYPE_ABSENT + } else { + val belated = attendanceType.getBoolean("Late") ?: false + val released = attendanceType.getBoolean("LegalAbsence") ?: false + val present = attendanceType.getBoolean("Presence") ?: true + if (belated) + if (excused) + Attendance.TYPE_BELATED_EXCUSED + else + Attendance.TYPE_BELATED + else if (released) + Attendance.TYPE_RELEASED + else if (present) + if (attendanceType.getInt("CategoryId") != 1) + Attendance.TYPE_PRESENT_CUSTOM + else + Attendance.TYPE_PRESENT + else + Attendance.TYPE_UNKNOWN + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeExams.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeExams.kt new file mode 100644 index 00000000..64b52e2b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeExams.kt @@ -0,0 +1,84 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-21. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_EXAMS +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_EXAMS +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS + +class VulcanHebeExams( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + companion object { + const val TAG = "VulcanHebeExams" + } + + init { + apiGetList( + TAG, + VULCAN_HEBE_ENDPOINT_EXAMS, + HebeFilterType.BY_PUPIL, + lastSync = lastSync + ) { list, _ -> + list.forEach { exam -> + val id = exam.getLong("Id") ?: return@forEach + val eventDate = getDate(exam, "Deadline") ?: return@forEach + val subjectId = getSubjectId(exam, "Subject") ?: -1 + val teacherId = getTeacherId(exam, "Creator") ?: -1 + val teamId = getTeamId(exam, "Distribution") + ?: getClassId(exam, "Class") + ?: data.teamClass?.id + ?: -1 + val topic = exam.getString("Content")?.trim() ?: "" + + if (!isCurrentYear(eventDate)) return@forEach + + val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate) + val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime + + val type = when (exam.getString("Type")) { + "Praca klasowa", + "Sprawdzian" -> Event.TYPE_EXAM + "Kartkówka" -> Event.TYPE_SHORT_QUIZ + else -> Event.TYPE_DEFAULT + } + + val eventObject = Event( + profileId = profileId, + id = id, + date = eventDate, + time = startTime, + topic = topic, + color = null, + type = type, + teacherId = teacherId, + subjectId = subjectId, + teamId = teamId + ) + + data.eventList.add(eventObject) + data.metadataList.add( + Metadata( + profileId, + Metadata.TYPE_EVENT, + id, + profile?.empty ?: true, + profile?.empty ?: true + ) + ) + } + + data.setSyncNext(ENDPOINT_VULCAN_HEBE_EXAMS, SYNC_ALWAYS) + onSuccess(ENDPOINT_VULCAN_HEBE_EXAMS) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGradeSummary.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGradeSummary.kt new file mode 100644 index 00000000..e38ac393 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGradeSummary.kt @@ -0,0 +1,88 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-22. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import pl.szczodrzynski.edziennik.DAY +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.utils.Utils + +class VulcanHebeGradeSummary( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + companion object { + const val TAG = "VulcanHebeGradeSummary" + } + + init { + val entries = mapOf( + "Entry_1" to + if (data.studentSemesterNumber == 1) + Grade.TYPE_SEMESTER1_PROPOSED + else Grade.TYPE_SEMESTER2_PROPOSED, + "Entry_2" to + if (data.studentSemesterNumber == 1) + Grade.TYPE_SEMESTER1_FINAL + else Grade.TYPE_SEMESTER2_FINAL + ) + + apiGetList( + TAG, + VULCAN_HEBE_ENDPOINT_GRADE_SUMMARY, + HebeFilterType.BY_PUPIL, + lastSync = lastSync + ) { list, _ -> + list.forEach { grade -> + val subjectId = getSubjectId(grade, "Subject") ?: return@forEach + val addedDate = getDateTime(grade, "DateModify") + + entries.onEach { (key, type) -> + val id = subjectId * -100 - type + val entry = grade.getString(key) ?: return@onEach + val value = Utils.getGradeValue(entry) + val color = Utils.getVulcanGradeColor(entry) + + val gradeObject = Grade( + profileId = profileId, + id = id, + name = entry, + type = type, + value = value, + weight = 0f, + color = color, + category = "", + description = null, + comment = null, + semester = data.studentSemesterNumber, + teacherId = -1, + subjectId = subjectId, + addedDate = addedDate + ) + + data.gradeList.add(gradeObject) + data.metadataList.add( + Metadata( + profileId, + Metadata.TYPE_GRADE, + id, + profile?.empty ?: true, + profile?.empty ?: true + ) + ) + } + } + + data.setSyncNext(ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY, 1 * DAY) + onSuccess(ENDPOINT_VULCAN_HEBE_GRADE_SUMMARY) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt new file mode 100644 index 00000000..9c0591de --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt @@ -0,0 +1,125 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-20. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_GRADES +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_GRADES +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import java.text.DecimalFormat +import kotlin.math.roundToInt + +class VulcanHebeGrades( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + companion object { + const val TAG = "VulcanHebeGrades" + } + + init { + apiGetList( + TAG, + VULCAN_HEBE_ENDPOINT_GRADES, + HebeFilterType.BY_PUPIL, + lastSync = lastSync + ) { list, _ -> + list.forEach { grade -> + val id = grade.getLong("Id") ?: return@forEach + + val column = grade.getJsonObject("Column") + val category = column.getJsonObject("Category") + val categoryText = category.getString("Name") + + val teacherId = getTeacherId(grade, "Creator") ?: -1 + val subjectId = getSubjectId(column, "Subject") ?: -1 + + val description = column.getString("Name") + val comment = grade.getString("Comment") + var value = grade.getFloat("Value") + var weight = column.getFloat("Weight") ?: 0.0f + val numerator = grade.getFloat("Numerator ") + val denominator = grade.getFloat("Denominator") + val addedDate = getDateTime(grade, "DateModify") + + var finalDescription = "" + + var name = when (numerator != null && denominator != null) { + true -> { + value = numerator / denominator + finalDescription += DecimalFormat("#.##").format(numerator) + + "/" + DecimalFormat("#.##").format(denominator) + weight = 0.0f + (value * 100).roundToInt().toString() + "%" + } + else -> { + if (value == null) weight = 0.0f + + grade.getString("Content") ?: "" + } + } + + comment?.also { + if (name == "") name = it + else finalDescription = (if (finalDescription == "") "" else " ") + it + } + + description?.also { + finalDescription = (if (finalDescription == "") "" else " - ") + it + } + + val columnColor = column.getInt("Color") ?: 0 + val color = if (columnColor == 0) + when (name) { + "1-", "1", "1+" -> 0xffd65757 + "2-", "2", "2+" -> 0xff9071b3 + "3-", "3", "3+" -> 0xffd2ab24 + "4-", "4", "4+" -> 0xff50b6d6 + "5-", "5", "5+" -> 0xff2cbd92 + "6-", "6", "6+" -> 0xff91b43c + else -> 0xff3D5F9C + }.toInt() + else + columnColor + + val gradeObject = Grade( + profileId = profileId, + id = id, + name = name, + type = Grade.TYPE_NORMAL, + value = value ?: 0.0f, + weight = weight, + color = color, + category = categoryText, + description = finalDescription, + comment = null, + semester = getSemester(column), + teacherId = teacherId, + subjectId = subjectId, + addedDate = addedDate + ) + + data.gradeList.add(gradeObject) + data.metadataList.add( + Metadata( + profileId, + Metadata.TYPE_GRADE, + id, + profile?.empty ?: true, + profile?.empty ?: true + ) + ) + } + + data.setSyncNext(ENDPOINT_VULCAN_HEBE_GRADES, SYNC_ALWAYS) + onSuccess(ENDPOINT_VULCAN_HEBE_GRADES) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeHomework.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeHomework.kt new file mode 100644 index 00000000..cb792e2c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeHomework.kt @@ -0,0 +1,94 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-21. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import pl.szczodrzynski.edziennik.asJsonObjectList +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_HOMEWORK +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_HOMEWORK +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.getJsonArray +import pl.szczodrzynski.edziennik.getLong +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.utils.Utils + +class VulcanHebeHomework( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + companion object { + const val TAG = "VulcanHebeHomework" + } + + init { + apiGetList( + TAG, + VULCAN_HEBE_ENDPOINT_HOMEWORK, + HebeFilterType.BY_PUPIL, + lastSync = lastSync + ) { list, _ -> + list.forEach { exam -> + val id = exam.getLong("IdHomework") ?: return@forEach + val eventDate = getDate(exam, "Deadline") ?: return@forEach + val subjectId = getSubjectId(exam, "Subject") ?: -1 + val teacherId = getTeacherId(exam, "Creator") ?: -1 + val teamId = data.teamClass?.id ?: -1 + val topic = exam.getString("Content")?.trim() ?: "" + + if (!isCurrentYear(eventDate)) return@forEach + + val lessonList = data.db.timetableDao().getAllForDateNow(profileId, eventDate) + val startTime = lessonList.firstOrNull { it.subjectId == subjectId }?.startTime + + val eventObject = Event( + profileId = profileId, + id = id, + date = eventDate, + time = startTime, + topic = topic, + color = null, + type = Event.TYPE_HOMEWORK, + teacherId = teacherId, + subjectId = subjectId, + teamId = teamId + ) + + val attachments = exam.getJsonArray("Attachments") + ?.asJsonObjectList() + ?: return@forEach + + for (attachment in attachments) { + val fileName = attachment.getString("Name") ?: continue + val url = attachment.getString("Link") ?: continue + val attachmentName = "$fileName:$url" + val attachmentId = Utils.crc32(attachmentName.toByteArray()) + + eventObject.addAttachment( + id = attachmentId, + name = attachmentName + ) + } + + data.eventList.add(eventObject) + data.metadataList.add( + Metadata( + profileId, + Metadata.TYPE_HOMEWORK, + id, + profile?.empty ?: true, + profile?.empty ?: true + ) + ) + } + + data.setSyncNext(ENDPOINT_VULCAN_HEBE_HOMEWORK, SYNC_ALWAYS) + onSuccess(ENDPOINT_VULCAN_HEBE_HOMEWORK) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeLuckyNumber.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeLuckyNumber.kt new file mode 100644 index 00000000..8ff1631b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeLuckyNumber.kt @@ -0,0 +1,72 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-22. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.getInt +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time +import pl.szczodrzynski.edziennik.utils.models.Week + +class VulcanHebeLuckyNumber( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + companion object { + const val TAG = "VulcanHebeLuckyNumber" + } + + init { + apiGet( + TAG, + VULCAN_HEBE_ENDPOINT_LUCKY_NUMBER, + query = mapOf( + "constituentId" to data.studentConstituentId.toString(), + "day" to Date.getToday().stringY_m_d + ) + ) { lucky: JsonObject?, _ -> + // sync tomorrow if lucky number set or is weekend or afternoon + var nextSync = Date.getToday().stepForward(0, 0, 1).inMillis + if (lucky == null) { + if (Date.getToday().weekDay <= Week.FRIDAY && Time.getNow().hour < 12) { + // working days morning, sync always + nextSync = SYNC_ALWAYS + } + } + else { + val luckyNumberDate = Date.fromY_m_d(lucky.getString("Day")) ?: Date.getToday() + val luckyNumber = lucky.getInt("Number") ?: -1 + val luckyNumberObject = LuckyNumber( + profileId = profileId, + date = luckyNumberDate, + number = luckyNumber + ) + + data.luckyNumberList.add(luckyNumberObject) + data.metadataList.add( + Metadata( + profileId, + Metadata.TYPE_LUCKY_NUMBER, + luckyNumberObject.date.value.toLong(), + true, + profile?.empty ?: false + ) + ) + } + + data.setSyncNext(ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER, syncAt = nextSync) + onSuccess(ENDPOINT_VULCAN_HEBE_LUCKY_NUMBER) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt new file mode 100644 index 00000000..5e2d31c0 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMain.kt @@ -0,0 +1,170 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-20. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import com.google.gson.JsonArray +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MAIN +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MAIN +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.utils.models.Date + +class VulcanHebeMain( + override val data: DataVulcan, + override val lastSync: Long? = null +) : VulcanHebe(data, lastSync) { + companion object { + const val TAG = "VulcanHebeMain" + } + + fun getStudents( + profile: Profile?, + profileList: MutableList?, + loginStoreId: Int? = null, + firstProfileId: Int? = null, + onEmpty: (() -> Unit)? = null, + onSuccess: () -> Unit + ) { + if (profile == null && (profileList == null || loginStoreId == null || firstProfileId == null)) + throw IllegalArgumentException() + + apiGet( + TAG, + VULCAN_HEBE_ENDPOINT_MAIN, + query = mapOf("lastSyncDate" to "null"), + baseUrl = profile == null + ) { students: JsonArray, _ -> + if (students.isEmpty()) { + if (onEmpty != null) + onEmpty() + else + onSuccess() + return@apiGet + } + + // safe to assume this will be non-null when creating a profile + var profileId = firstProfileId ?: loginStoreId ?: 1 + + students.forEach { studentEl -> + val student = studentEl.asJsonObject + + val pupil = student.getJsonObject("Pupil") + val studentId = pupil.getInt("Id") ?: return@forEach + + // check the student ID in case of not first login + if (profile != null && data.studentId != studentId) + return@forEach + + val unit = student.getJsonObject("Unit") + val constituentUnit = student.getJsonObject("ConstituentUnit") + val login = student.getJsonObject("Login") + val periods = student.getJsonArray("Periods")?.map { + it.asJsonObject + } ?: listOf() + + val period = periods.firstOrNull { + it.getBoolean("Current", false) + } ?: return@forEach + + val periodLevel = period.getInt("Level") ?: return@forEach + val semester1 = periods.firstOrNull { + it.getInt("Level") == periodLevel && it.getInt("Number") == 1 + } + val semester2 = periods.firstOrNull { + it.getInt("Level") == periodLevel && it.getInt("Number") == 2 + } + + val schoolSymbol = unit.getString("Symbol") ?: return@forEach + val schoolShort = constituentUnit.getString("Short") ?: return@forEach + val schoolCode = "${data.symbol}_$schoolSymbol" + + val studentUnitId = unit.getInt("Id") ?: return@forEach + val studentConstituentId = constituentUnit.getInt("Id") ?: return@forEach + val studentLoginId = login.getInt("Id") ?: return@forEach + //val studentClassId = student.getInt("IdOddzial") ?: return@forEach + val studentClassName = student.getString("ClassDisplay") ?: return@forEach + val studentFirstName = pupil.getString("FirstName") ?: "" + val studentLastName = pupil.getString("Surname") ?: "" + val studentNameLong = "$studentFirstName $studentLastName".fixName() + val studentNameShort = "$studentFirstName ${studentLastName[0]}.".fixName() + val userLogin = login.getString("Value") ?: "" + + val studentSemesterId = period.getInt("Id") ?: return@forEach + val studentSemesterNumber = period.getInt("Number") ?: return@forEach + + val senderEntry = student.getJsonObject("SenderEntry") + val senderAddressName = senderEntry.getString("Address") + val senderAddressHash = senderEntry.getString("AddressHash") + + val hebeContext = student.getString("Context") + + val isParent = login.getString("LoginRole").equals("opiekun", ignoreCase = true) + val accountName = if (isParent) + login.getString("DisplayName")?.fixName() + else null + + val dateSemester1Start = semester1 + ?.getJsonObject("Start") + ?.getString("Date") + ?.let { Date.fromY_m_d(it) } + val dateSemester2Start = semester2 + ?.getJsonObject("Start") + ?.getString("Date") + ?.let { Date.fromY_m_d(it) } + val dateYearEnd = semester2 + ?.getJsonObject("End") + ?.getString("Date") + ?.let { Date.fromY_m_d(it) } + + val newProfile = profile ?: Profile( + profileId++, + loginStoreId!!, + LOGIN_TYPE_VULCAN, + studentNameLong, + userLogin, + studentNameLong, + studentNameShort, + accountName + ) + + newProfile.apply { + this.studentClassName = studentClassName + studentData["symbol"] = data.symbol + + studentData["studentId"] = studentId + studentData["studentUnitId"] = studentUnitId + studentData["studentConstituentId"] = studentConstituentId + studentData["studentLoginId"] = studentLoginId + studentData["studentSemesterId"] = studentSemesterId + studentData["studentSemesterNumber"] = studentSemesterNumber + studentData["semester1Id"] = semester1?.getInt("Id") ?: 0 + studentData["semester2Id"] = semester2?.getInt("Id") ?: 0 + studentData["schoolSymbol"] = schoolSymbol + studentData["schoolShort"] = schoolShort + studentData["schoolName"] = schoolCode + studentData["senderAddressName"] = senderAddressName + studentData["senderAddressHash"] = senderAddressHash + studentData["hebeContext"] = hebeContext + } + dateSemester1Start?.let { + newProfile.dateSemester1Start = it + newProfile.studentSchoolYearStart = it.year + } + dateSemester2Start?.let { newProfile.dateSemester2Start = it } + dateYearEnd?.let { newProfile.dateYearEnd = it } + + if (profile != null) + data.setSyncNext(ENDPOINT_VULCAN_HEBE_MAIN, 1 * DAY) + + profileList?.add(newProfile) + } + + onSuccess() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessages.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessages.kt new file mode 100644 index 00000000..eb4091e0 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessages.kt @@ -0,0 +1,151 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-21. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import androidx.core.util.set +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_MESSAGES_SENT +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.* +import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_DELETED +import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED +import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_SENT +import pl.szczodrzynski.edziennik.utils.Utils +import pl.szczodrzynski.navlib.crc16 +import kotlin.text.replace + +class VulcanHebeMessages( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + companion object { + const val TAG = "VulcanHebeMessagesInbox" + } + + private fun getPersonId(json: JsonObject): Long { + val senderLoginId = json.getInt("LoginId") ?: return -1 + /*if (senderLoginId == data.studentLoginId) + return -1*/ + + val senderName = json.getString("Address") ?: return -1 + val senderNameSplit = senderName.splitName() + val senderLoginIdStr = senderLoginId.toString() + val teacher = data.teacherList.singleOrNull { it.loginId == senderLoginIdStr } + ?: Teacher( + profileId, + -1 * crc16(senderName).toLong(), + senderNameSplit?.second ?: "", + senderNameSplit?.first ?: "", + senderLoginIdStr + ).also { + it.setTeacherType(Teacher.TYPE_OTHER) + data.teacherList[it.id] = it + } + return teacher.id + } + + fun getMessages(messageType: Int) { + val folder = when (messageType) { + TYPE_RECEIVED -> 1 + TYPE_SENT -> 2 + TYPE_DELETED -> 3 + else -> 1 + } + val endpointId = when (messageType) { + TYPE_RECEIVED -> ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX + TYPE_SENT -> ENDPOINT_VULCAN_HEBE_MESSAGES_SENT + else -> ENDPOINT_VULCAN_HEBE_MESSAGES_INBOX + } + apiGetList( + TAG, + VULCAN_HEBE_ENDPOINT_MESSAGES, + HebeFilterType.BY_PERSON, + folder = folder, + lastSync = lastSync + ) { list, _ -> + list.forEach { message -> + val id = message.getLong("Id") ?: return@forEach + val subject = message.getString("Subject") ?: return@forEach + val body = message.getString("Content") ?: return@forEach + + val sender = message.getJsonObject("Sender") ?: return@forEach + + val sentDate = getDateTime(message, "DateSent") + val readDate = getDateTime(message, "DateRead", default = 0) + + if (!isCurrentYear(sentDate)) return@forEach + + val messageObject = Message( + profileId = profileId, + id = id, + type = messageType, + subject = subject, + body = body.replace("\n", "
    "), + senderId = if (messageType == TYPE_RECEIVED) getPersonId(sender) else null, + addedDate = sentDate + ) + + val receivers = message.getJsonArray("Receiver") + ?.asJsonObjectList() + ?: return@forEach + val receiverReadDate = + if (receivers.size == 1) readDate + else -1 + + for (receiver in receivers) { + val messageRecipientObject = MessageRecipient( + profileId, + if (messageType == TYPE_SENT) getPersonId(receiver) else -1, + -1, + receiverReadDate, + id + ) + data.messageRecipientList.add(messageRecipientObject) + } + + val attachments = message.getJsonArray("Attachments") + ?.asJsonObjectList() + ?: return@forEach + + for (attachment in attachments) { + val fileName = attachment.getString("Name") ?: continue + val url = attachment.getString("Link") ?: continue + val attachmentName = "$fileName:$url" + val attachmentId = Utils.crc32(attachmentName.toByteArray()) + + messageObject.addAttachment( + id = attachmentId, + name = attachmentName, + size = -1 + ) + } + + data.messageList.add(messageObject) + data.setSeenMetadataList.add( + Metadata( + profileId, + Metadata.TYPE_MESSAGE, + id, + readDate > 0 || messageType == TYPE_SENT, + readDate > 0 || messageType == TYPE_SENT + ) + ) + } + + data.setSyncNext( + endpointId, + if (messageType == TYPE_RECEIVED) SYNC_ALWAYS else 1 * DAY, + if (messageType == TYPE_RECEIVED) null else DRAWER_ITEM_MESSAGES + ) + onSuccess(endpointId) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessagesChangeStatus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessagesChangeStatus.kt new file mode 100644 index 00000000..ff5dbe4c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeMessagesChangeStatus.kt @@ -0,0 +1,66 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-21. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.JsonObject +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.api.events.MessageGetEvent +import pl.szczodrzynski.edziennik.data.db.entity.Message +import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.full.MessageFull + +class VulcanHebeMessagesChangeStatus( + override val data: DataVulcan, + private val messageObject: MessageFull, + val onSuccess: () -> Unit +) : VulcanHebe(data, null) { + companion object { + const val TAG = "VulcanHebeMessagesChangeStatus" + } + + init { + apiPost( + TAG, + VULCAN_HEBE_ENDPOINT_MESSAGES_STATUS, + payload = JsonObject( + "MessageId" to messageObject.id, + "LoginId" to data.studentLoginId, + "Status" to 1 + ) + ) { _: Boolean, _ -> + + if (!messageObject.seen) { + data.setSeenMetadataList.add( + Metadata( + profileId, + Metadata.TYPE_MESSAGE, + messageObject.id, + true, + true + ) + ) + messageObject.seen = true + } + + if (messageObject.type != Message.TYPE_SENT) { + val messageRecipientObject = MessageRecipient( + profileId, + -1, + -1, + System.currentTimeMillis(), + messageObject.id + ) + data.messageRecipientList.add(messageRecipientObject) + } + + EventBus.getDefault().postSticky(MessageGetEvent(messageObject)) + onSuccess() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeNotices.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeNotices.kt new file mode 100644 index 00000000..5b67b272 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeNotices.kt @@ -0,0 +1,77 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2021-2-22 + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_NOTICES +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_NOTICES +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Notice +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS + +class VulcanHebeNotices( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + + companion object { + const val TAG = "VulcanHebeNotices" + } + + init { + apiGetList( + TAG, + VULCAN_HEBE_ENDPOINT_NOTICES, + HebeFilterType.BY_PUPIL, + lastSync = lastSync + ) { list, _ -> + list.forEach { notice -> + val id = notice.getLong("Id") ?: return@forEach + val type = when (notice.getBoolean("Positive")) { + true -> Notice.TYPE_POSITIVE + else -> Notice.TYPE_NEUTRAL + } + val date = getDate(notice, "DateValid") ?: return@forEach + val semester = profile?.dateToSemester(date) ?: return@forEach + val text = notice.getString("Content") ?: "" + val category = notice.getJsonObject("Category")?.getString("Name") + val points = notice.getFloat("Points") + val teacherId = getTeacherId(notice, "Creator") ?: -1 + val addedDate = getDateTime(notice, "DateModify") + + if (!isCurrentYear(date)) return@forEach + + val noticeObject = Notice( + profileId = profileId, + id = id, + type = type, + semester = semester, + text = text, + category = category, + points = points, + teacherId = teacherId, + addedDate = addedDate + ) + + data.noticeList.add(noticeObject) + data.metadataList.add( + Metadata( + profileId, + Metadata.TYPE_NOTICE, + id, + profile?.empty ?: true, + profile?.empty ?: true + ) + ) + } + + data.setSyncNext(ENDPOINT_VULCAN_HEBE_NOTICES, SYNC_ALWAYS) + onSuccess(ENDPOINT_VULCAN_HEBE_NOTICES) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebePushConfig.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebePushConfig.kt new file mode 100644 index 00000000..fdf81bcb --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebePushConfig.kt @@ -0,0 +1,36 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-22. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import com.google.gson.JsonPrimitive +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_PUSH_ALL +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_PUSH_CONFIG +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS + +class VulcanHebePushConfig( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + companion object { + const val TAG = "VulcanHebePushConfig" + } + + init { + apiPost( + TAG, + VULCAN_HEBE_ENDPOINT_PUSH_ALL, + payload = JsonPrimitive("on") + ) { _: Boolean, _ -> + // sync always: this endpoint has .shouldSync set + data.setSyncNext(ENDPOINT_VULCAN_HEBE_PUSH_CONFIG, SYNC_ALWAYS) + data.app.config.sync.tokenVulcanList = + data.app.config.sync.tokenVulcanList + profileId + onSuccess(ENDPOINT_VULCAN_HEBE_PUSH_CONFIG) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeSendMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeSendMessage.kt new file mode 100644 index 00000000..c6a02ae7 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeSendMessage.kt @@ -0,0 +1,99 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-22. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import com.google.gson.JsonObject +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.ERROR_VULCAN_HEBE_MISSING_SENDER_ENTRY +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_MESSAGES_SEND +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.api.events.MessageSentEvent +import pl.szczodrzynski.edziennik.data.db.entity.Message +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Teacher + +class VulcanHebeSendMessage( + override val data: DataVulcan, + val recipients: List, + val subject: String, + val text: String, + val onSuccess: () -> Unit +) : VulcanHebe(data, null) { + companion object { + const val TAG = "VulcanHebeSendMessage" + } + + init { + if (data.senderAddressName == null || data.senderAddressHash == null) { + VulcanHebeMain(data).getStudents(data.profile, null) { + if (data.senderAddressName == null || data.senderAddressHash == null) { + data.error(TAG, ERROR_VULCAN_HEBE_MISSING_SENDER_ENTRY) + } + else { + sendMessage() + } + } + } + else { + sendMessage() + } + } + + private fun sendMessage() { + val recipientsArray = JsonArray() + recipients.forEach { teacher -> + recipientsArray += JsonObject( + "Address" to teacher.fullNameLastFirst, + "LoginId" to (teacher.loginId?.toIntOrNull() ?: return@forEach), + "Initials" to teacher.initialsLastFirst, + "AddressHash" to teacher.fullNameLastFirst.sha1Hex() + ) + } + + val senderName = (profile?.accountName ?: profile?.studentNameLong) + ?.swapFirstLastName() ?: "" + val sender = JsonObject( + "Address" to data.senderAddressName, + "LoginId" to data.studentLoginId.toString(), + "Initials" to senderName.getNameInitials(), + "AddressHash" to data.senderAddressHash + ) + + apiPost( + TAG, + VULCAN_HEBE_ENDPOINT_MESSAGES_SEND, + payload = JsonObject( + "Status" to 1, + "Sender" to sender, + "DateSent" to null, + "DateRead" to null, + "Content" to text, + "Receiver" to recipientsArray, + "Id" to 0, + "Subject" to subject, + "Attachments" to null, + "Self" to null + ) + ) { json: JsonObject, _ -> + val messageId = json.getLong("Id") + + if (messageId == null) { + // TODO error + return@apiPost + } + + VulcanHebeMessages(data, null) { + val message = data.messageList.firstOrNull { it.type == Message.TYPE_SENT && it.subject == subject } + val metadata = data.metadataList.firstOrNull { it.thingType == Metadata.TYPE_MESSAGE && it.thingId == messageId } + val event = MessageSentEvent(data.profileId, message, message?.addedDate) + + EventBus.getDefault().postSticky(event) + onSuccess() + }.getMessages(Message.TYPE_SENT) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeTimetable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeTimetable.kt new file mode 100644 index 00000000..ffbb0289 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeTimetable.kt @@ -0,0 +1,254 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-21. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe + +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TIMETABLE +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_TIMETABLE +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.api.models.DataRemoveModel +import pl.szczodrzynski.edziennik.data.db.entity.Lesson +import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_CANCELLED +import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_CHANGE +import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_NORMAL +import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_SHIFTED_SOURCE +import pl.szczodrzynski.edziennik.data.db.entity.Lesson.Companion.TYPE_SHIFTED_TARGET +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.utils.Utils.d +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Week + +class VulcanHebeTimetable( + override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanHebe(data, lastSync) { + companion object { + const val TAG = "VulcanHebeTimetable" + } + + private val lessonList = mutableListOf() + private val lessonDates = mutableSetOf() + + init { + val previousWeekStart = Week.getWeekStart().stepForward(0, 0, -7) + if (Date.getToday().weekDay > 4) { + previousWeekStart.stepForward(0, 0, 7) + } + + val dateFrom = data.arguments + ?.getString("weekStart") + ?.let { Date.fromY_m_d(it) } + ?: previousWeekStart + val dateTo = dateFrom.clone().stepForward(0, 0, 13) + + val lastSync = 0L + + apiGetList( + TAG, + VULCAN_HEBE_ENDPOINT_TIMETABLE, + HebeFilterType.BY_PUPIL, + dateFrom = dateFrom, + dateTo = dateTo, + lastSync = lastSync + ) { lessons, _ -> + apiGetList( + TAG, + VULCAN_HEBE_ENDPOINT_TIMETABLE_CHANGES, + HebeFilterType.BY_PUPIL, + dateFrom = dateFrom, + dateTo = dateTo, + lastSync = lastSync + ) { changes, _ -> + processData(lessons, changes) + + // cancel lesson changes when caused by a shift + for (lesson in lessonList) { + if (lesson.type != TYPE_SHIFTED_TARGET) + continue + lessonList.firstOrNull { + it.oldDate == lesson.date + && it.oldLessonNumber == lesson.lessonNumber + && it.type == TYPE_CHANGE + }?.let { + it.type = TYPE_CANCELLED + it.date = null + it.lessonNumber = null + it.startTime = null + it.endTime = null + it.subjectId = null + it.teacherId = null + it.teamId = null + it.classroom = null + } + } + + // add TYPE_NO_LESSONS to empty dates + val date: Date = dateFrom.clone() + while (date <= dateTo) { + if (!lessonDates.contains(date.value)) { + lessonList.add(Lesson(profileId, date.value.toLong()).apply { + this.type = Lesson.TYPE_NO_LESSONS + this.date = date.clone() + }) + } + + date.stepForward(0, 0, 1) + } + + d( + TAG, + "Clearing lessons between ${dateFrom.stringY_m_d} and ${dateTo.stringY_m_d}" + ) + + data.toRemove.add(DataRemoveModel.Timetable.between(dateFrom, dateTo)) + + data.lessonList.addAll(lessonList) + + data.setSyncNext(ENDPOINT_VULCAN_HEBE_TIMETABLE, SYNC_ALWAYS) + onSuccess(ENDPOINT_VULCAN_HEBE_TIMETABLE) + } + } + } + + private fun buildLesson(changes: List, json: JsonObject): Pair? { + val lesson = Lesson(profileId, -1) + var lessonShift: Lesson? = null + + val lessonDate = getDate(json, "Date") ?: return null + val lessonRange = getLessonRange(json, "TimeSlot") + val startTime = lessonRange?.startTime + val endTime = lessonRange?.endTime + val teacherId = getTeacherId(json, "TeacherPrimary") + val classroom = json.getJsonObject("Room").getString("Code") + val subjectId = getSubjectId(json, "Subject") + + val teamId = getTeamId(json, "Distribution") + ?: getClassId(json, "Clazz") + ?: data.teamClass?.id + ?: -1 + + val change = json.getJsonObject("Change") + val changeId = change.getInt("Id") + val type = when (change.getInt("Type")) { + 1 -> TYPE_CANCELLED + 2 -> TYPE_CHANGE + 3 -> TYPE_SHIFTED_SOURCE + 4 -> TYPE_CANCELLED // TODO: 2021-02-21 add showing cancellation reason + else -> TYPE_NORMAL + } + + lesson.type = type + if (type == TYPE_NORMAL) { + lesson.date = lessonDate + lesson.lessonNumber = lessonRange?.lessonNumber + lesson.startTime = startTime + lesson.endTime = endTime + lesson.subjectId = subjectId + lesson.teacherId = teacherId + lesson.teamId = teamId + lesson.classroom = classroom + } else { + lesson.oldDate = lessonDate + lesson.oldLessonNumber = lessonRange?.lessonNumber + lesson.oldStartTime = startTime + lesson.oldEndTime = endTime + lesson.oldSubjectId = subjectId + lesson.oldTeacherId = teacherId + lesson.oldTeamId = teamId + lesson.oldClassroom = classroom + } + + if (type == TYPE_CHANGE || type == TYPE_SHIFTED_SOURCE) { + val changeJson = changes.firstOrNull { + it.getInt("Id") == changeId + } ?: return lesson to null + + val changeLessonDate = getDate(changeJson, "LessonDate") ?: return lesson to null + val changeLessonRange = getLessonRange(changeJson, "TimeSlot") ?: lessonRange + val changeStartTime = changeLessonRange?.startTime + val changeEndTime = changeLessonRange?.endTime + val changeTeacherId = getTeacherId(changeJson, "TeacherPrimary") ?: teacherId + val changeClassroom = changeJson.getJsonObject("Room").getString("Code") ?: classroom + val changeSubjectId = getSubjectId(changeJson, "Subject") ?: subjectId + + val changeTeamId = getTeamId(json, "Distribution") + ?: getClassId(json, "Clazz") + ?: teamId + + if (type != TYPE_CHANGE) { + /* lesson shifted */ + lessonShift = Lesson(profileId, -1) + lessonShift.type = TYPE_SHIFTED_TARGET + + // update source lesson with the target lesson date + lesson.date = changeLessonDate + lesson.lessonNumber = changeLessonRange?.lessonNumber + lesson.startTime = changeStartTime + lesson.endTime = changeEndTime + // update target lesson with the source lesson date + lessonShift.oldDate = lessonDate + lessonShift.oldLessonNumber = lessonRange?.lessonNumber + lessonShift.oldStartTime = startTime + lessonShift.oldEndTime = endTime + } + + (if (type == TYPE_CHANGE) lesson else lessonShift) + ?.apply { + this.date = changeLessonDate + this.lessonNumber = changeLessonRange?.lessonNumber + this.startTime = changeStartTime + this.endTime = changeEndTime + this.subjectId = changeSubjectId + this.teacherId = changeTeacherId + this.teamId = changeTeamId + this.classroom = changeClassroom + } + } + + return lesson to lessonShift + } + + private fun processData(lessons: List, changes: List) { + lessons.forEach { lessonJson -> + if (lessonJson.getBoolean("Visible") != true) + return@forEach + + val lessonPair = buildLesson(changes, lessonJson) ?: return@forEach + val (lessonObject, lessonShift) = lessonPair + + when { + lessonShift != null -> lessonShift + lessonObject.type != TYPE_NORMAL -> lessonObject + else -> null + }?.let { lesson -> + val lessonDate = lesson.displayDate ?: return@let + val seen = profile?.empty ?: true || lessonDate < Date.getToday() + data.metadataList.add( + Metadata( + profileId, + Metadata.TYPE_LESSON_CHANGE, + lesson.id, + seen, + seen + ) + ) + } + + lessonObject.id = lessonObject.buildId() + lessonShift?.id = lessonShift?.buildId() ?: -1 + + lessonList.add(lessonObject) + lessonShift?.let { lessonList.add(it) } + + lessonObject.displayDate?.let { lessonDates.add(it.value) } + lessonShift?.displayDate?.let { lessonDates.add(it.value) } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/web/HomepageTile.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/web/HomepageTile.kt new file mode 100644 index 00000000..4d657ac7 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/web/HomepageTile.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-20. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.web + +import com.google.gson.annotations.SerializedName + +data class HomepageTile( + @SerializedName("Nazwa") + val name: String?, + @SerializedName("Url") + val url: String?, + @SerializedName("Zawartosc") + val children: List +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/web/VulcanWebLuckyNumber.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/web/VulcanWebLuckyNumber.kt new file mode 100644 index 00000000..cbf24c2a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/web/VulcanWebLuckyNumber.kt @@ -0,0 +1,86 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-20. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.web + +import pl.szczodrzynski.edziennik.DAY +import pl.szczodrzynski.edziennik.data.api.VULCAN_WEB_ENDPOINT_LUCKY_NUMBER +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanWebMain +import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.SYNC_ALWAYS +import pl.szczodrzynski.edziennik.getJsonArray +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time +import pl.szczodrzynski.edziennik.utils.models.Week + +class VulcanWebLuckyNumber(override val data: DataVulcan, + override val lastSync: Long?, + val onSuccess: (endpointId: Int) -> Unit +) : VulcanWebMain(data, lastSync) { + companion object { + const val TAG = "VulcanWebLuckyNumber" + } + + init { + webGetJson(TAG, WEB_MAIN, VULCAN_WEB_ENDPOINT_LUCKY_NUMBER, parameters = mapOf( + "permissions" to data.webPermissions + )) { json, _ -> + val tiles = json + .getJsonArray("data") + ?.mapNotNull { data.app.gson.fromJson(it.toString(), HomepageTile::class.java) } + ?.flatMap { it.children } + + if (tiles == null) { + data.setSyncNext(ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS, SYNC_ALWAYS) + onSuccess(ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS) + return@webGetJson + } + + var nextSync = System.currentTimeMillis() + 1* DAY *1000 + + tiles.firstOrNull { it.name == data.schoolShort }?.children?.firstOrNull()?.let { tile -> + // "Szczęśliwy numer w dzienniku: 16" + return@let tile.name?.substringAfterLast(' ')?.toIntOrNull()?.let { number -> + // lucky number present + val luckyNumberObject = LuckyNumber( + profileId, + Date.getToday(), + number + ) + + data.luckyNumberList.add(luckyNumberObject) + data.metadataList.add( + Metadata( + profileId, + Metadata.TYPE_LUCKY_NUMBER, + luckyNumberObject.date.value.toLong(), + true, + profile?.empty ?: false + )) + } + } ?: { + // no lucky number + if (Date.getToday().weekDay <= Week.FRIDAY && Time.getNow().hour >= 22) { + // working days, after 10PM + // consider the lucky number is disabled; sync in 4 days + nextSync = System.currentTimeMillis() + 4*DAY*1000 + } + else if (Date.getToday().weekDay <= Week.FRIDAY && Time.getNow().hour < 22) { + // working days, before 10PM + + } + else { + // weekends + nextSync = Week.getNearestWeekDayDate(Week.MONDAY).combineWith(Time(5, 0, 0)) + } + }() + + data.setSyncNext(ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS, SYNC_ALWAYS) + onSuccess(ENDPOINT_VULCAN_WEB_LUCKY_NUMBERS) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/firstlogin/VulcanFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/firstlogin/VulcanFirstLogin.kt index b82388d1..2bf633f8 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/firstlogin/VulcanFirstLogin.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/firstlogin/VulcanFirstLogin.kt @@ -6,101 +6,122 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.firstlogin import org.greenrobot.eventbus.EventBus import pl.szczodrzynski.edziennik.* -import pl.szczodrzynski.edziennik.data.api.ERROR_NO_STUDENTS_IN_ACCOUNT -import pl.szczodrzynski.edziennik.data.api.VULCAN_API_ENDPOINT_STUDENT_LIST +import pl.szczodrzynski.edziennik.data.api.* import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanApi -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginApi +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanWebMain +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe.VulcanHebeMain +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.CufsCertificate +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginHebe +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login.VulcanLoginWebMain import pl.szczodrzynski.edziennik.data.api.events.FirstLoginFinishedEvent import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile -import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.data.db.entity.Profile class VulcanFirstLogin(val data: DataVulcan, val onSuccess: () -> Unit) { companion object { const val TAG = "VulcanFirstLogin" } - private val api = VulcanApi(data) + private val web = VulcanWebMain(data, null) + private val hebe = VulcanHebe(data, null) private val profileList = mutableListOf() + private val loginStoreId = data.loginStore.id + private var firstProfileId = loginStoreId + private val tryingSymbols = mutableListOf() init { - VulcanLoginApi(data) { - api.apiGet(TAG, VULCAN_API_ENDPOINT_STUDENT_LIST, baseUrl = true) { json, response -> - val students = json.getJsonArray("Data") + if (data.loginStore.mode == LOGIN_MODE_VULCAN_WEB) { + VulcanLoginWebMain(data) { + val xml = web.readCertificate() ?: run { + data.error(ApiError(TAG, ERROR_VULCAN_WEB_NO_CERTIFICATE)) + return@VulcanLoginWebMain + } + val certificate = web.parseCertificate(xml) - if (students == null || students.size() < 1) { - data.error(ApiError(TAG, ERROR_NO_STUDENTS_IN_ACCOUNT) - .withResponse(response) - .withApiResponse(json)) - return@apiGet + if (data.symbol != null && data.symbol != "default") { + tryingSymbols += data.symbol ?: "default" + } + else { + + tryingSymbols += certificate.userInstances } - students.forEach { studentEl -> - val student = studentEl.asJsonObject - - val schoolSymbol = student.getString("JednostkaSprawozdawczaSymbol") ?: return@forEach - val schoolName = "${data.symbol}_$schoolSymbol" - val studentId = student.getInt("Id") ?: return@forEach - val studentLoginId = student.getInt("UzytkownikLoginId") ?: return@forEach - val studentClassId = student.getInt("IdOddzial") ?: return@forEach - val studentClassName = student.getString("OkresPoziom").toString() + (student.getString("OddzialSymbol") ?: return@forEach) - val studentSemesterId = student.getInt("IdOkresKlasyfikacyjny") ?: return@forEach - val studentFirstName = student.getString("Imie") ?: "" - val studentLastName = student.getString("Nazwisko") ?: "" - val studentNameLong = "$studentFirstName $studentLastName".fixName() - val studentNameShort = "$studentFirstName ${studentLastName[0]}.".fixName() - - val userLogin = student.getString("UzytkownikLogin") ?: "" - val currentSemesterStartDate = student.getLong("OkresDataOd") ?: return@forEach - val currentSemesterEndDate = (student.getLong("OkresDataDo") - ?: return@forEach) + 86400 - val studentSemesterNumber = student.getInt("OkresNumer") ?: return@forEach - - val newProfile = Profile() - newProfile.empty = true - - val isParent = student.getString("UzytkownikRola") == "opiekun" - val userName = if (isParent) - student.getString("UzytkownikNazwa")?.swapFirstLastName()?.fixName() - else - null - newProfile.accountNameLong = userName - newProfile.studentClassName = studentClassName - val today = Date.getToday() - newProfile.studentSchoolYear = "${today.year}/${today.year+1}" - - newProfile.putStudentData("studentId", studentId) - newProfile.putStudentData("studentLoginId", studentLoginId) - newProfile.putStudentData("studentClassId", studentClassId) - newProfile.putStudentData("studentSemesterId", studentSemesterId) - newProfile.putStudentData("schoolSymbol", schoolSymbol) - newProfile.putStudentData("schoolName", schoolName) - newProfile.putStudentData("currentSemesterEndDate", currentSemesterEndDate) - newProfile.putStudentData("studentSemesterNumber", studentSemesterNumber) - - when (studentSemesterNumber) { - 1 -> { - newProfile.dateSemester1Start = Date.fromMillis(currentSemesterStartDate * 1000) - newProfile.dateSemester2Start = Date.fromMillis(currentSemesterEndDate * 1000) - } - 2 -> { - newProfile.dateSemester2Start = Date.fromMillis(currentSemesterStartDate * 1000) - newProfile.dateYearEnd = Date.fromMillis(currentSemesterEndDate * 1000) - } - } - - newProfile.studentNameLong = studentNameLong - newProfile.studentNameShort = studentNameShort - newProfile.name = studentNameLong - newProfile.subname = userLogin - - profileList.add(newProfile) - } - - EventBus.getDefault().post(FirstLoginFinishedEvent(profileList, data.loginStore)) + checkSymbol(certificate) + } + } + else { + registerDeviceHebe { + EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore)) onSuccess() } } } + + private fun checkSymbol(certificate: CufsCertificate) { + if (tryingSymbols.isEmpty()) { + EventBus.getDefault().postSticky(FirstLoginFinishedEvent(profileList, data.loginStore)) + onSuccess() + return + } + + val result = web.postCertificate(certificate, tryingSymbols.removeAt(0)) { symbol, state -> + when (state) { + VulcanWebMain.STATE_NO_REGISTER -> { + checkSymbol(certificate) + } + VulcanWebMain.STATE_LOGGED_OUT -> data.error(ApiError(TAG, ERROR_VULCAN_WEB_LOGGED_OUT)) + VulcanWebMain.STATE_SUCCESS -> { + webRegisterDevice(symbol) { + checkSymbol(certificate) + } + } + } + } + + // postCertificate returns false if the cert is not valid anymore + if (!result) { + data.error(ApiError(TAG, ERROR_VULCAN_WEB_CERTIFICATE_EXPIRED) + .withApiResponse(certificate.xml)) + } + } + + private fun webRegisterDevice(symbol: String, onSuccess: () -> Unit) { + web.getStartPage(symbol, postErrors = false) { _, schoolSymbols -> + if (schoolSymbols.isEmpty()) { + onSuccess() + return@getStartPage + } + data.symbol = symbol + val schoolSymbol = data.schoolSymbol ?: schoolSymbols.firstOrNull() + web.webGetJson(TAG, VulcanWebMain.WEB_NEW, "$schoolSymbol/$VULCAN_WEB_ENDPOINT_REGISTER_DEVICE") { result, _ -> + val json = result.getJsonObject("data") + data.symbol = symbol + data.apiToken = data.apiToken.toMutableMap().also { + it[symbol] = json.getString("TokenKey") + } + data.apiPin = data.apiPin.toMutableMap().also { + it[symbol] = json.getString("PIN") + } + registerDeviceHebe(onSuccess) + } + } + } + + private fun registerDeviceHebe(onSuccess: () -> Unit) { + VulcanLoginHebe(data) { + VulcanHebeMain(data).getStudents( + profile = null, + profileList, + loginStoreId, + firstProfileId, + onEmpty = { + EventBus.getDefault() + .postSticky(FirstLoginFinishedEvent(listOf(), data.loginStore)) + onSuccess() + }, + onSuccess = onSuccess + ) + } + } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/CufsCertificate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/CufsCertificate.kt new file mode 100644 index 00000000..45fc96d2 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/CufsCertificate.kt @@ -0,0 +1,23 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-17. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login + +import pl.droidsonroids.jspoon.annotation.Selector + +class CufsCertificate { + @Selector(value = "EndpointReference Address") + var targetUrl: String = "" + + @Selector(value = "Lifetime Created") + var createdDate: String = "" + + @Selector(value = "Lifetime Expires") + var expiryDate: String = "" + + @Selector(value = "Attribute[AttributeName=UserInstance] AttributeValue") + var userInstances: List = listOf() + + var xml = "" +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLogin.kt index 4c11caf3..3cbb7ea7 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLogin.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLogin.kt @@ -5,7 +5,8 @@ package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_API +import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_HEBE +import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_VULCAN_WEB_MAIN import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan import pl.szczodrzynski.edziennik.utils.Utils @@ -45,9 +46,13 @@ class VulcanLogin(val data: DataVulcan, val onSuccess: () -> Unit) { } Utils.d(TAG, "Using login method $loginMethodId") when (loginMethodId) { - LOGIN_METHOD_VULCAN_API -> { + LOGIN_METHOD_VULCAN_WEB_MAIN -> { + data.startProgress(R.string.edziennik_progress_login_vulcan_web_main) + VulcanLoginWebMain(data) { onSuccess(loginMethodId) } + } + LOGIN_METHOD_VULCAN_HEBE -> { data.startProgress(R.string.edziennik_progress_login_vulcan_api) - VulcanLoginApi(data) { onSuccess(loginMethodId) } + VulcanLoginHebe(data) { onSuccess(loginMethodId) } } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt deleted file mode 100644 index dfa1c2ac..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginApi.kt +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-6. - */ - -package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login - -import android.os.Build -import com.google.gson.JsonObject -import im.wangchao.mhttp.Request -import im.wangchao.mhttp.Response -import im.wangchao.mhttp.callback.JsonCallbackHandler -import io.github.wulkanowy.signer.android.getPrivateKeyFromCert -import pl.szczodrzynski.edziennik.data.api.* -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan -import pl.szczodrzynski.edziennik.data.api.models.ApiError -import pl.szczodrzynski.edziennik.currentTimeUnix -import pl.szczodrzynski.edziennik.getJsonObject -import pl.szczodrzynski.edziennik.getString -import pl.szczodrzynski.edziennik.isNotNullNorEmpty -import pl.szczodrzynski.edziennik.utils.Utils.d -import java.net.HttpURLConnection.HTTP_BAD_REQUEST -import java.util.* -import java.util.regex.Pattern - -class VulcanLoginApi(val data: DataVulcan, val onSuccess: () -> Unit) { - companion object { - private const val TAG = "VulcanLoginApi" - } - - init { run { - if (data.profile != null && data.isApiLoginValid()) { - onSuccess() - } - else { - if (data.apiCertificatePfx.isNotNullNorEmpty()) { - try { - data.apiCertificatePrivate = getPrivateKeyFromCert( - if (data.apiToken?.get(0) == 'F') VULCAN_API_PASSWORD_FAKELOG else VULCAN_API_PASSWORD, - data.apiCertificatePfx ?: "" - ) - data.loginStore.removeLoginData("certificatePfx") - } catch (e: Throwable) { - e.printStackTrace() - } finally { - onSuccess() - return@run - } - } - if (data.symbol.isNotNullNorEmpty() && data.apiToken.isNotNullNorEmpty() && data.apiPin.isNotNullNorEmpty()) { - loginWithToken() - } - else { - data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING)) - } - } - }} - - private fun loginWithToken() { - d(TAG, "Request: Vulcan/Login/Api - ${data.apiUrl}/$VULCAN_API_ENDPOINT_CERTIFICATE") - - val callback = object : JsonCallbackHandler() { - override fun onSuccess(json: JsonObject?, response: Response?) { - if (json == null) { - if (response?.code() == HTTP_BAD_REQUEST) { - data.error(TAG, ERROR_LOGIN_VULCAN_INVALID_SYMBOL, response) - return - } - data.error(ApiError(TAG, ERROR_RESPONSE_EMPTY) - .withResponse(response)) - return - } - - var tokenStatus = json.getString("TokenStatus") - if (tokenStatus == "Null" || tokenStatus == "CertGenerated") - tokenStatus = null - val error = tokenStatus ?: json.getString("Message") - error?.let { code -> - when (code) { - "TokenNotFound" -> ERROR_LOGIN_VULCAN_INVALID_TOKEN - "TokenDead" -> ERROR_LOGIN_VULCAN_EXPIRED_TOKEN - "WrongPIN" -> { - Pattern.compile("Liczba pozostałych prób: ([0-9])", Pattern.DOTALL).matcher(tokenStatus).let { matcher -> - if (matcher.matches()) - ERROR_LOGIN_VULCAN_INVALID_PIN + 1 + matcher.group(1).toInt() - else - ERROR_LOGIN_VULCAN_INVALID_PIN - } - } - "Broken" -> ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING - "OnlyKindergarten" -> ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN - "NoPupils" -> ERROR_LOGIN_VULCAN_NO_PUPILS - else -> ERROR_LOGIN_VULCAN_OTHER - }.let { errorCode -> - data.error(ApiError(TAG, errorCode) - .withApiResponse(json) - .withResponse(response)) - return - } - } - - val cert = json.getJsonObject("TokenCert") - if (cert == null) { - data.error(ApiError(TAG, ERROR_LOGIN_VULCAN_OTHER) - .withApiResponse(json) - .withResponse(response)) - return - } - - data.apiCertificateKey = cert.getString("CertyfikatKlucz") - data.apiCertificatePfx = cert.getString("CertyfikatPfx") - data.apiCertificateExpiryTime = 1598832000 - data.apiToken = data.apiToken?.substring(0, 3) - data.apiCertificatePrivate = getPrivateKeyFromCert( - if (data.apiToken?.get(0) == 'F') VULCAN_API_PASSWORD_FAKELOG else VULCAN_API_PASSWORD, - data.apiCertificatePfx ?: "" - ) - data.loginStore.removeLoginData("certificatePfx") - data.loginStore.removeLoginData("devicePin") - onSuccess() - } - - override fun onFailure(response: Response?, throwable: Throwable?) { - data.error(ApiError(TAG, ERROR_REQUEST_FAILURE) - .withResponse(response) - .withThrowable(throwable)) - } - } - - Request.builder() - .url("${data.apiUrl}/$VULCAN_API_ENDPOINT_CERTIFICATE") - .userAgent(VULCAN_API_USER_AGENT) - .addHeader("RequestMobileType", "RegisterDevice") - .addParameter("PIN", data.apiPin) - .addParameter("TokenKey", data.apiToken) - .addParameter("DeviceId", UUID.randomUUID().toString()) - .addParameter("DeviceName", VULCAN_API_DEVICE_NAME) - .addParameter("DeviceNameUser", "") - .addParameter("DeviceDescription", "") - .addParameter("DeviceSystemType", "Android") - .addParameter("DeviceSystemVersion", Build.VERSION.RELEASE) - .addParameter("RemoteMobileTimeKey", currentTimeUnix()) - .addParameter("TimeKey", currentTimeUnix() - 1) - .addParameter("RequestId", UUID.randomUUID().toString()) - .addParameter("AppVersion", VULCAN_API_APP_VERSION) - .addParameter("RemoteMobileAppVersion", VULCAN_API_APP_VERSION) - .addParameter("RemoteMobileAppName", VULCAN_API_APP_NAME) - .postJson() - .allowErrorCode(HTTP_BAD_REQUEST) - .callback(callback) - .build() - .enqueue() - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginHebe.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginHebe.kt new file mode 100644 index 00000000..ded6e937 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginHebe.kt @@ -0,0 +1,110 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-20. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login + +import com.google.gson.JsonObject +import io.github.wulkanowy.signer.hebe.generateKeyPair +import pl.szczodrzynski.edziennik.JsonObject +import pl.szczodrzynski.edziennik.data.api.ERROR_LOGIN_DATA_MISSING +import pl.szczodrzynski.edziennik.data.api.VULCAN_API_DEVICE_NAME +import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_REGISTER_NEW +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.isNotNullNorEmpty + +class VulcanLoginHebe(val data: DataVulcan, val onSuccess: () -> Unit) { + companion object { + private const val TAG = "VulcanLoginHebe" + } + + init { run { + // i'm sure this does something useful + // not quite sure what, though + if (data.studentSemesterNumber == 1 && data.semester1Id == 0) + data.semester1Id = data.studentSemesterNumber + if (data.studentSemesterNumber == 2 && data.semester2Id == 0) + data.semester2Id = data.studentSemesterNumber + + copyFromLoginStore() + + if (data.profile != null && data.isHebeLoginValid()) { + onSuccess() + } + else { + if (data.symbol.isNotNullNorEmpty() && data.apiToken[data.symbol].isNotNullNorEmpty() && data.apiPin[data.symbol].isNotNullNorEmpty()) { + loginWithToken() + } + else { + data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING)) + } + } + }} + + private fun copyFromLoginStore() { + data.loginStore.data.apply { + // map form inputs to the symbol + if (has("symbol")) { + data.symbol = getString("symbol") + remove("symbol") + } + if (has("deviceToken")) { + data.apiToken = data.apiToken.toMutableMap().also { + it[data.symbol] = getString("deviceToken") + } + remove("deviceToken") + } + if (has("devicePin")) { + data.apiPin = data.apiPin.toMutableMap().also { + it[data.symbol] = getString("devicePin") + } + remove("devicePin") + } + } + } + + private fun loginWithToken() { + val szkolnyApi = SzkolnyApi(data.app) + val hebe = VulcanHebe(data, null) + + if (data.hebePublicKey == null || data.hebePrivateKey == null || data.hebePublicHash == null) { + val (publicPem, privatePem, publicHash) = generateKeyPair() + data.hebePublicKey = publicPem + data.hebePrivateKey = privatePem + data.hebePublicHash = publicHash + } + + val firebaseToken = szkolnyApi.runCatching({ + getFirebaseToken("vulcan") + }, onError = { + // screw errors + }) ?: data.app.config.sync.tokenVulcan + + hebe.apiPost( + TAG, + VULCAN_HEBE_ENDPOINT_REGISTER_NEW, + payload = JsonObject( + "OS" to "Android", + "PIN" to data.apiPin[data.symbol], + "Certificate" to data.hebePublicKey, + "CertificateType" to "RSA_PEM", + "DeviceModel" to VULCAN_API_DEVICE_NAME, + "SecurityToken" to data.apiToken[data.symbol], + "SelfIdentifier" to data.buildDeviceId(), + "CertificateThumbprint" to data.hebePublicHash + ), + baseUrl = true, + firebaseToken = firebaseToken + ) { _: JsonObject, _ -> + data.apiToken = data.apiToken.toMutableMap().also { + it[data.symbol] = it[data.symbol]?.substring(0, 3) + } + data.loginStore.removeLoginData("apiPin") + onSuccess() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginWebMain.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginWebMain.kt new file mode 100644 index 00000000..2b62eb14 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/login/VulcanLoginWebMain.kt @@ -0,0 +1,128 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-16. + */ + +package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.login + +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan +import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanWebMain +import pl.szczodrzynski.edziennik.data.api.models.ApiError +import pl.szczodrzynski.edziennik.getString +import pl.szczodrzynski.edziennik.isNotNullNorEmpty +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.fslogin.FSLogin +import pl.szczodrzynski.fslogin.realm.toRealm + +class VulcanLoginWebMain(val data: DataVulcan, val onSuccess: () -> Unit) { + companion object { + private const val TAG = "VulcanLoginWebMain" + } + + private val web by lazy { VulcanWebMain(data, null) } + + init { run { + copyFromLoginStore() + + if (data.profile != null && data.isWebMainLoginValid()) { + onSuccess() + } + else { + if (data.symbol.isNotNullNorEmpty() + && data.webRealmData != null + && (data.webEmail.isNotNullNorEmpty() || data.webUsername.isNotNullNorEmpty()) + && data.webPassword.isNotNullNorEmpty()) { + try { + val success = loginWithCredentials() + if (!success) + data.error(ApiError(TAG, ERROR_VULCAN_WEB_DATA_MISSING)) + } catch (e: Exception) { + data.error(ApiError(TAG, EXCEPTION_VULCAN_WEB_LOGIN) + .withThrowable(e)) + } + } + else { + data.error(ApiError(TAG, ERROR_LOGIN_DATA_MISSING)) + } + } + }} + + private fun copyFromLoginStore() { + data.loginStore.data.apply { + // 4.0 - new login form - copy user input to profile + if (has("symbol")) { + data.symbol = getString("symbol") + remove("symbol") + } + // 4.6 - form inputs renamed + if (has("email")) { + data.webEmail = getString("email") + remove("email") + } + if (has("username")) { + data.webUsername = getString("username") + remove("username") + } + if (has("password")) { + data.webPassword = getString("password") + remove("password") + } + } + + if (data.symbol == null && data.webRealmData != null) { + data.symbol = data.webRealmData?.symbol + } + } + + private fun loginWithCredentials(): Boolean { + val realm = data.webRealmData?.toRealm() ?: return false + + val certificate = web.readCertificate()?.let { web.parseCertificate(it) } + if (certificate != null && Date.fromIso(certificate.expiryDate) > System.currentTimeMillis()) { + useCertificate(certificate) + return true + } + + val fsLogin = FSLogin(data.app.http, debug = App.devMode) + fsLogin.performLogin( + realm = realm, + username = data.webUsername ?: data.webEmail ?: return false, + password = data.webPassword ?: return false, + onSuccess = { fsCertificate -> + web.saveCertificate(fsCertificate.wresult) + useCertificate(web.parseCertificate(fsCertificate.wresult)) + }, + onFailure = { errorText -> + // TODO + data.error(ApiError(TAG, 0).withThrowable(RuntimeException(errorText))) + } + ) + + return true + } + + private fun useCertificate(certificate: CufsCertificate) { + // auto-post certificate when not first login + if (data.profile != null && data.symbol != null && data.symbol != "default") { + val result = web.postCertificate(certificate, data.symbol ?: "default") { _, state -> + when (state) { + VulcanWebMain.STATE_SUCCESS -> { + web.getStartPage { _, _ -> onSuccess() } + } + VulcanWebMain.STATE_NO_REGISTER -> data.error(ApiError(TAG, ERROR_VULCAN_WEB_NO_REGISTER)) + VulcanWebMain.STATE_LOGGED_OUT -> data.error(ApiError(TAG, ERROR_VULCAN_WEB_LOGGED_OUT)) + } + } + // postCertificate returns false if the cert is not valid anymore + if (!result) { + data.error(ApiError(TAG, ERROR_VULCAN_WEB_CERTIFICATE_EXPIRED) + .withApiResponse(certificate.xml)) + } + } + else { + // first login - succeed immediately + onSuccess() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/AnnouncementGetEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/AnnouncementGetEvent.kt new file mode 100644 index 00000000..237c1c33 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/AnnouncementGetEvent.kt @@ -0,0 +1,9 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-26 + */ + +package pl.szczodrzynski.edziennik.data.api.events + +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull + +data class AnnouncementGetEvent(val announcement: AnnouncementFull) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/ApiTaskStartedEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/ApiTaskStartedEvent.kt index 20783e4b..b0f5bd67 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/ApiTaskStartedEvent.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/ApiTaskStartedEvent.kt @@ -4,6 +4,6 @@ package pl.szczodrzynski.edziennik.data.api.events -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Profile class ApiTaskStartedEvent(val profileId: Int, val profile: Profile? = null) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/AttachmentGetEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/AttachmentGetEvent.kt index cbc85b7d..52415c56 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/AttachmentGetEvent.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/AttachmentGetEvent.kt @@ -4,11 +4,21 @@ package pl.szczodrzynski.edziennik.data.api.events -data class AttachmentGetEvent(val profileId: Int, val messageId: Long, val attachmentId: Long, +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Message + +data class AttachmentGetEvent(val profileId: Int, val owner: Any, val attachmentId: Long, var eventType: Int = TYPE_PROGRESS, val fileName: String? = null, val bytesWritten: Long = 0) { companion object { const val TYPE_PROGRESS = 0 const val TYPE_FINISHED = 1 } + + val ownerId + get() = when (owner) { + is Message -> owner.id + is Event -> owner.id + else -> -1 + } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/EventGetEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/EventGetEvent.kt new file mode 100644 index 00000000..00cf1727 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/EventGetEvent.kt @@ -0,0 +1,9 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-3-31. + */ + +package pl.szczodrzynski.edziennik.data.api.events + +import pl.szczodrzynski.edziennik.data.db.full.EventFull + +data class EventGetEvent(val event: EventFull) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/FeedbackMessageEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/FeedbackMessageEvent.kt new file mode 100644 index 00000000..aeb3ac0c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/FeedbackMessageEvent.kt @@ -0,0 +1,9 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-21. + */ + +package pl.szczodrzynski.edziennik.data.api.events + +import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage + +data class FeedbackMessageEvent(val message: FeedbackMessage) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/FirstLoginFinishedEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/FirstLoginFinishedEvent.kt index b74ef2c7..114c2d3a 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/FirstLoginFinishedEvent.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/FirstLoginFinishedEvent.kt @@ -1,6 +1,6 @@ package pl.szczodrzynski.edziennik.data.api.events -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile data class FirstLoginFinishedEvent(val profileList: List, val loginStore: LoginStore) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/MessageGetEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/MessageGetEvent.kt index b9d72295..182a356f 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/MessageGetEvent.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/MessageGetEvent.kt @@ -4,6 +4,6 @@ package pl.szczodrzynski.edziennik.data.api.events -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull +import pl.szczodrzynski.edziennik.data.db.full.MessageFull data class MessageGetEvent(val message: MessageFull) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/MessageSentEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/MessageSentEvent.kt new file mode 100644 index 00000000..6da0ae9b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/MessageSentEvent.kt @@ -0,0 +1,9 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-12-27. + */ + +package pl.szczodrzynski.edziennik.data.api.events + +import pl.szczodrzynski.edziennik.data.db.entity.Message + +data class MessageSentEvent(val profileId: Int, val message: Message?, val sentDate: Long?) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/ProfileListEmptyEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/ProfileListEmptyEvent.kt new file mode 100644 index 00000000..aef467b0 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/ProfileListEmptyEvent.kt @@ -0,0 +1,7 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-18. + */ + +package pl.szczodrzynski.edziennik.data.api.events + +class ProfileListEmptyEvent \ No newline at end of file diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/RecipientListGetEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/RecipientListGetEvent.kt new file mode 100644 index 00000000..1d3bd49c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/RecipientListGetEvent.kt @@ -0,0 +1,9 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-12-22. + */ + +package pl.szczodrzynski.edziennik.data.api.events + +import pl.szczodrzynski.edziennik.data.db.entity.Teacher + +data class RecipientListGetEvent(val profileId: Int, val teacherList: List) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/RegisterAvailabilityEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/RegisterAvailabilityEvent.kt new file mode 100644 index 00000000..2a3531df --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/RegisterAvailabilityEvent.kt @@ -0,0 +1,7 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-9-3. + */ + +package pl.szczodrzynski.edziennik.data.api.events + +class RegisterAvailabilityEvent() diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/UserActionRequiredEvent.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/UserActionRequiredEvent.kt new file mode 100644 index 00000000..d88fa652 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/events/UserActionRequiredEvent.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-2-15. + */ + +package pl.szczodrzynski.edziennik.data.api.events + +data class UserActionRequiredEvent(val profileId: Int, val type: Int) { + companion object { + const val LOGIN_DATA_MOBIDZIENNIK = 101 + const val LOGIN_DATA_LIBRUS = 102 + const val LOGIN_DATA_IDZIENNIK = 103 + const val LOGIN_DATA_VULCAN = 104 + const val LOGIN_DATA_EDUDZIENNIK = 105 + const val CAPTCHA_LIBRUS = 202 + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/EdziennikInterface.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/EdziennikInterface.kt index e3e11066..153bbe18 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/EdziennikInterface.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/interfaces/EdziennikInterface.kt @@ -5,14 +5,20 @@ package pl.szczodrzynski.edziennik.data.api.interfaces import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull +import pl.szczodrzynski.edziennik.data.db.entity.Teacher +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.data.db.full.MessageFull interface EdziennikInterface { - fun sync(featureIds: List, viewId: Int? = null, arguments: JsonObject? = null) + fun sync(featureIds: List, viewId: Int? = null, onlyEndpoints: List? = null, arguments: JsonObject? = null) fun getMessage(message: MessageFull) + fun sendMessage(recipients: List, subject: String, text: String) fun markAllAnnouncementsAsRead() - fun getAttachment(message: Message, attachmentId: Long, attachmentName: String) + fun getAnnouncement(announcement: AnnouncementFull) + fun getAttachment(owner: Any, attachmentId: Long, attachmentName: String) + fun getRecipientList() + fun getEvent(eventFull: EventFull) fun firstLogin() fun cancel() } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/ApiError.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/ApiError.kt index 78785ef7..d99e16a2 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/ApiError.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/ApiError.kt @@ -8,8 +8,22 @@ import android.content.Context import com.google.gson.JsonObject import im.wangchao.mhttp.Request import im.wangchao.mhttp.Response +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.api.ERROR_API_EXCEPTION +import pl.szczodrzynski.edziennik.data.api.ERROR_EXCEPTION +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApiException +import pl.szczodrzynski.edziennik.data.api.szkolny.request.ErrorReportRequest +import pl.szczodrzynski.edziennik.stackTraceString +import pl.szczodrzynski.edziennik.toErrorCode -class ApiError(val tag: String, val errorCode: Int) { +class ApiError(val tag: String, var errorCode: Int) { + companion object { + fun fromThrowable(tag: String, throwable: Throwable) = + ApiError(tag, throwable.toErrorCode() ?: ERROR_EXCEPTION) + .withThrowable(throwable) + } + + val id = System.currentTimeMillis() var profileId: Int? = null var throwable: Throwable? = null var apiResponse: String? = null @@ -44,16 +58,8 @@ class ApiError(val tag: String, val errorCode: Int) { return this } - fun toAppError(): AppError { - return AppError( - tag, - -1, - errorCode, response, throwable, apiResponse - ) - } - - fun getStringReason(context: Context): String { - return context.resources.getIdentifier("error_${errorCode}_reason", "string", context.packageName).let { + fun getStringText(context: Context): String { + return context.resources.getIdentifier("error_${errorCode}", "string", context.packageName).let { if (it != 0) context.getString(it) else @@ -61,9 +67,47 @@ class ApiError(val tag: String, val errorCode: Int) { } } + fun getStringReason(context: Context): String { + if (errorCode == ERROR_API_EXCEPTION && throwable is SzkolnyApiException) + return throwable?.message.toString() + return context.resources.getIdentifier("error_${errorCode}_reason", "string", context.packageName).let { + if (it != 0) + context.getString(it) + else + context.getString(R.string.error_unknown_format, errorCode, tag) + } + } + override fun toString(): String { return "ApiError(tag='$tag', errorCode=$errorCode, profileId=$profileId, throwable=$throwable, apiResponse=$apiResponse, request=$request, response=$response, isCritical=$isCritical)" } + fun toReportableError(context: Context): ErrorReportRequest.Error { + val requestString = request?.let { + it.method() + " " + it.url() + "\n" + it.headers() + "\n\n" + (it.jsonBody()?.toString() ?: "") + (it.textBody() ?: "") + } + val responseString = response?.let { + if (it.parserErrorBody == null) { + try { + it.parserErrorBody = it.raw().body()?.string() + } catch (e: Exception) { + it.parserErrorBody = e.stackTraceString + } + } + "HTTP "+it.code()+" "+it.message()+"\n" + it.headers() + "\n\n" + it.parserErrorBody + } + return ErrorReportRequest.Error( + id = id, + tag = tag, + errorCode = errorCode, + errorText = getStringText(context), + errorReason = getStringReason(context), + stackTrace = throwable?.stackTraceString, + request = requestString, + response = responseString, + apiResponse = apiResponse ?: response?.parserErrorBody, + isCritical = isCritical + ) + } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/AppError.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/AppError.java deleted file mode 100644 index 018d042f..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/AppError.java +++ /dev/null @@ -1,324 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-11-26 - */ - -package pl.szczodrzynski.edziennik.data.api.models; - -import android.content.Context; -import android.os.AsyncTask; -import android.os.Build; -import android.util.Log; - -import com.google.gson.JsonObject; - -import java.io.InterruptedIOException; -import java.net.SocketTimeoutException; -import java.net.UnknownHostException; - -import javax.net.ssl.SSLException; - -import im.wangchao.mhttp.Request; -import im.wangchao.mhttp.Response; -import pl.szczodrzynski.edziennik.R; - - -public class AppError { - public static final int CODE_OTHER = 0; - public static final int CODE_OK = 1; - public static final int CODE_NO_INTERNET = 10; - public static final int CODE_SSL_ERROR = 13; - public static final int CODE_ARCHIVED = 5; - public static final int CODE_MAINTENANCE = 6; - public static final int CODE_LOGIN_ERROR = 7; - public static final int CODE_ACCOUNT_MISMATCH = 8; - public static final int CODE_APP_SERVER_ERROR = 9; - public static final int CODE_MULTIACCOUNT_SETUP = 12; - public static final int CODE_TIMEOUT = 11; - public static final int CODE_PROFILE_NOT_FOUND = 14; - public static final int CODE_ATTACHMENT_NOT_AVAILABLE = 28; - // user's fault - public static final int CODE_INVALID_LOGIN = 2; - public static final int CODE_INVALID_SERVER_ADDRESS = 21; - public static final int CODE_INVALID_SCHOOL_NAME = 22; - public static final int CODE_INVALID_DEVICE = 23; - public static final int CODE_OLD_PASSWORD = 4; - public static final int CODE_INVALID_TOKEN = 24; - public static final int CODE_EXPIRED_TOKEN = 27; - public static final int CODE_INVALID_SYMBOL = 25; - public static final int CODE_INVALID_PIN = 26; - public static final int CODE_LIBRUS_NOT_ACTIVATED = 29; - public static final int CODE_SYNERGIA_NOT_ACTIVATED = 32; - public static final int CODE_LIBRUS_DISCONNECTED = 31; - public static final int CODE_PROFILE_ARCHIVED = 30; - - - public static final int CODE_INTERNAL_MISSING_DATA = 100; - // internal errors - not for user's information. - // these error codes are processed in API main classes - - public String TAG; - public int line; - public int errorCode; - public String errorText; - public Response response; - public Request request; - public Throwable throwable; - public String apiResponse; - - public AppError(String TAG, int line, int errorCode, String errorText, Response response, Request request, Throwable throwable, String apiResponse) { - this.TAG = TAG; - this.line = line; - this.errorCode = errorCode; - this.errorText = errorText; - this.response = response; - this.request = request; - this.throwable = throwable; - this.apiResponse = apiResponse; - } - - public AppError(String TAG, int line, int errorCode) { - this(TAG, line, errorCode, null, null, null, null, null); - } - public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable) { - this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, null); - } - public AppError(String TAG, int line, int errorCode, Response response) { - this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, null); - } - public AppError(String TAG, int line, int errorCode, Throwable throwable, String apiResponse) { - this(TAG, line, errorCode, null, null, null, throwable, apiResponse); - } - public AppError(String TAG, int line, int errorCode, Throwable throwable, JsonObject apiResponse) { - this(TAG, line, errorCode, null, null, null, throwable, apiResponse == null ? null : apiResponse.toString()); - } - public AppError(String TAG, int line, int errorCode, String errorText, Response response, JsonObject apiResponse) { - this(TAG, line, errorCode, errorText, response, response == null ? null : response.request(), null, apiResponse == null ? null : apiResponse.toString()); - } - public AppError(String TAG, int line, int errorCode, String errorText, Response response, String apiResponse) { - this(TAG, line, errorCode, errorText, response, response == null ? null : response.request(), null, apiResponse); - } - public AppError(String TAG, int line, int errorCode, String errorText, String apiResponse) { - this(TAG, line, errorCode, errorText, null, null, null, apiResponse); - } - public AppError(String TAG, int line, int errorCode, String errorText, JsonObject apiResponse) { - this(TAG, line, errorCode, errorText, null, null, null, apiResponse == null ? null : apiResponse.toString()); - } - public AppError(String TAG, int line, int errorCode, String errorText) { - this(TAG, line, errorCode, errorText, null, null, null, null); - } - public AppError(String TAG, int line, int errorCode, JsonObject apiResponse) { - this(TAG, line, errorCode, null, null, null, null, apiResponse.toString()); - } - public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable, JsonObject apiResponse) { - this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, apiResponse == null ? null : apiResponse.toString()); - } - public AppError(String TAG, int line, int errorCode, Response response, Throwable throwable, String apiResponse) { - this(TAG, line, errorCode, null, response, response == null ? null : response.request(), throwable, apiResponse); - } - public AppError(String TAG, int line, int errorCode, Response response, String apiResponse) { - this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, apiResponse); - } - public AppError(String TAG, int line, int errorCode, Response response, JsonObject apiResponse) { - this(TAG, line, errorCode, null, response, response == null ? null : response.request(), null, apiResponse == null ? null : apiResponse.toString()); - } - - public String getDetails(Context context) { - StringBuilder sb = new StringBuilder(); - sb.append(stringErrorCode(context, errorCode, errorText)).append("\n"); - sb.append("(").append(stringErrorType(errorCode)).append("#").append(errorCode).append(")\n"); - sb.append("at ").append(TAG).append(":").append(line).append("\n"); - sb.append("\n"); - if (throwable == null) - sb.append("Throwable is null"); - else - sb.append(Log.getStackTraceString(throwable)); - sb.append("\n"); - sb.append(Build.MANUFACTURER).append(" ").append(Build.BRAND).append(" ").append(Build.MODEL).append(" ").append(Build.DEVICE).append("\n"); - - return sb.toString(); - } - - public interface GetApiResponseCallback { - void onSuccess(String apiResponse); - } - /** - * - * @param context a Context - * @param apiResponseCallback a callback executed on a worker thread - */ - public void getApiResponse(Context context, GetApiResponseCallback apiResponseCallback) { - StringBuilder sb = new StringBuilder(); - sb.append("Request:\n"); - if (request != null) { - sb.append(request.method()).append(" ").append(request.url().toString()).append("\n"); - sb.append(request.headers().toString()).append("\n"); - sb.append("\n"); - sb.append(request.bodyToString()).append("\n\n"); - } - else - sb.append("null\n\n"); - - if (apiResponse == null && response != null) - apiResponse = response.parserErrorBody; - - sb.append("Response:\n"); - if (response != null) { - sb.append(response.code()).append(" ").append(response.message()).append("\n"); - sb.append(response.headers().toString()).append("\n"); - sb.append("\n"); - if (apiResponse == null) { - if (Thread.currentThread().getName().equals("main")) { - AsyncTask.execute(() -> { - if (response.raw().body() != null) { - try { - sb.append(response.raw().body().string()); - } catch (Exception e) { - sb.append("Exception while getting response body:\n").append(Log.getStackTraceString(e)); - } - } - else { - sb.append("null"); - } - apiResponseCallback.onSuccess(sb.toString()); - }); - } - else { - if (response.raw().body() != null) { - try { - sb.append(response.raw().body().string()); - } catch (Exception e) { - sb.append("Exception while getting response body:\n").append(Log.getStackTraceString(e)); - } - } - else { - sb.append("null"); - } - apiResponseCallback.onSuccess(sb.toString()); - } - return; - } - } - else - sb.append("null\n\n"); - - sb.append("API Response:\n"); - if (apiResponse != null) { - sb.append(apiResponse).append("\n\n"); - } - else { - sb.append("null\n\n"); - } - - apiResponseCallback.onSuccess(sb.toString()); - } - - public AppError changeIfCodeOther() { - if (errorCode != CODE_OTHER && errorCode != CODE_MAINTENANCE) - return this; - if (throwable instanceof UnknownHostException) - errorCode = CODE_NO_INTERNET; - else if (throwable instanceof SSLException) - errorCode = CODE_SSL_ERROR; - else if (throwable instanceof SocketTimeoutException) - errorCode = CODE_TIMEOUT; - else if (throwable instanceof InterruptedIOException) - errorCode = CODE_NO_INTERNET; - else if (response != null && - (response.code() == 424 - || response.code() == 400 - || response.code() == 401 - || response.code() == 500 - || response.code() == 503 - || response.code() == 404)) - errorCode = CODE_MAINTENANCE; - return this; - } - - public String asReadableString(Context context) { - return stringErrorCode(context, errorCode, errorText) + (errorCode == CODE_MAINTENANCE && errorText != null && !errorText.isEmpty() ? " ("+errorText+")" : ""); - } - - public static String stringErrorCode(Context context, int errorCode, String errorText) - { - switch (errorCode) { - case CODE_OK: - return context.getString(R.string.sync_error_ok); - case CODE_INVALID_LOGIN: - return context.getString(R.string.sync_error_invalid_login); - case CODE_LOGIN_ERROR: - return context.getString(R.string.sync_error_login_error); - case CODE_INVALID_DEVICE: - return context.getString(R.string.sync_error_invalid_device); - case CODE_OLD_PASSWORD: - return context.getString(R.string.sync_error_old_password); - case CODE_ARCHIVED: - return context.getString(R.string.sync_error_archived); - case CODE_MAINTENANCE: - return context.getString(R.string.sync_error_maintenance); - case CODE_NO_INTERNET: - return context.getString(R.string.sync_error_no_internet); - case CODE_ACCOUNT_MISMATCH: - return context.getString(R.string.sync_error_account_mismatch); - case CODE_APP_SERVER_ERROR: - return context.getString(R.string.sync_error_app_server); - case CODE_TIMEOUT: - return context.getString(R.string.sync_error_timeout); - case CODE_SSL_ERROR: - return context.getString(R.string.sync_error_ssl); - case CODE_INVALID_SERVER_ADDRESS: - return context.getString(R.string.sync_error_invalid_server_address); - case CODE_INVALID_SCHOOL_NAME: - return context.getString(R.string.sync_error_invalid_school_name); - case CODE_PROFILE_NOT_FOUND: - return context.getString(R.string.sync_error_profile_not_found); - case CODE_INVALID_TOKEN: - return context.getString(R.string.sync_error_invalid_token); - case CODE_ATTACHMENT_NOT_AVAILABLE: - return context.getString(R.string.sync_error_attachment_not_available); - case CODE_LIBRUS_NOT_ACTIVATED: - return context.getString(R.string.sync_error_librus_not_activated); - case CODE_PROFILE_ARCHIVED: - return context.getString(R.string.sync_error_profile_archived); - case CODE_LIBRUS_DISCONNECTED: - return context.getString(R.string.sync_error_librus_disconnected); - case CODE_SYNERGIA_NOT_ACTIVATED: - return context.getString(R.string.sync_error_synergia_not_activated); - default: - case CODE_MULTIACCOUNT_SETUP: - case CODE_OTHER: - return errorText != null ? errorText : context.getString(R.string.sync_error_unknown); - } - } - public static String stringErrorType(int errorCode) - { - switch (errorCode) { - default: - case CODE_OTHER: return "CODE_OTHER"; - case CODE_OK: return "CODE_OK"; - case CODE_NO_INTERNET: return "CODE_NO_INTERNET"; - case CODE_SSL_ERROR: return "CODE_SSL_ERROR"; - case CODE_ARCHIVED: return "CODE_ARCHIVED"; - case CODE_MAINTENANCE: return "CODE_MAINTENANCE"; - case CODE_LOGIN_ERROR: return "CODE_LOGIN_ERROR"; - case CODE_ACCOUNT_MISMATCH: return "CODE_ACCOUNT_MISMATCH"; - case CODE_APP_SERVER_ERROR: return "CODE_APP_SERVER_ERROR"; - case CODE_MULTIACCOUNT_SETUP: return "CODE_MULTIACCOUNT_SETUP"; - case CODE_TIMEOUT: return "CODE_TIMEOUT"; - case CODE_PROFILE_NOT_FOUND: return "CODE_PROFILE_NOT_FOUND"; - case CODE_INVALID_LOGIN: return "CODE_INVALID_LOGIN"; - case CODE_INVALID_SERVER_ADDRESS: return "CODE_INVALID_SERVER_ADDRESS"; - case CODE_INVALID_SCHOOL_NAME: return "CODE_INVALID_SCHOOL_NAME"; - case CODE_INVALID_DEVICE: return "CODE_INVALID_DEVICE"; - case CODE_OLD_PASSWORD: return "CODE_OLD_PASSWORD"; - case CODE_INVALID_TOKEN: return "CODE_INVALID_TOKEN"; - case CODE_EXPIRED_TOKEN: return "CODE_EXPIRED_TOKEN"; - case CODE_INVALID_SYMBOL: return "CODE_INVALID_SYMBOL"; - case CODE_INVALID_PIN: return "CODE_INVALID_PIN"; - case CODE_ATTACHMENT_NOT_AVAILABLE: return "CODE_ATTACHMENT_NOT_AVAILABLE"; - case CODE_LIBRUS_NOT_ACTIVATED: return "CODE_LIBRUS_NOT_ACTIVATED"; - case CODE_PROFILE_ARCHIVED: return "CODE_PROFILE_ARCHIVED"; - case CODE_LIBRUS_DISCONNECTED: return "CODE_LIBRUS_DISCONNECTED"; - case CODE_SYNERGIA_NOT_ACTIVATED: return "CODE_SYNERGIA_NOT_ACTIVATED"; - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt index fddb4be0..2b7bdf1a 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/Data.kt @@ -2,54 +2,23 @@ package pl.szczodrzynski.edziennik.data.api.models import android.util.LongSparseArray import android.util.SparseArray +import androidx.core.util.set import androidx.core.util.size +import androidx.room.OnConflictStrategy import com.google.gson.JsonObject import im.wangchao.mhttp.Response -import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.data.api.DataNotifications -import pl.szczodrzynski.edziennik.data.api.EXCEPTION_NOTIFY +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.ERROR_REQUEST_FAILURE import pl.szczodrzynski.edziennik.data.api.interfaces.EndpointCallback -import pl.szczodrzynski.edziennik.data.api.models.AppError.* import pl.szczodrzynski.edziennik.data.db.AppDb -import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement -import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimer -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance -import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceType -import pl.szczodrzynski.edziennik.data.db.modules.classrooms.Classroom -import pl.szczodrzynski.edziennik.data.db.modules.events.Event -import pl.szczodrzynski.edziennik.data.db.modules.events.EventType -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory -import pl.szczodrzynski.edziennik.data.db.modules.lessons.Lesson -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice -import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile -import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject -import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsence -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceType -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team -import pl.szczodrzynski.edziennik.singleOrNull -import pl.szczodrzynski.edziennik.toSparseArray -import pl.szczodrzynski.edziennik.utils.Utils.d +import pl.szczodrzynski.edziennik.data.db.entity.* +import pl.szczodrzynski.edziennik.utils.Utils import pl.szczodrzynski.edziennik.utils.models.Date -import pl.szczodrzynski.edziennik.values -import java.io.InterruptedIOException -import java.net.SocketTimeoutException -import java.net.UnknownHostException -import javax.net.ssl.SSLException -open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) { +abstract class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) { companion object { private const val TAG = "Data" + private val DEBUG = true && BuildConfig.DEBUG } var fakeLogin = false @@ -88,10 +57,10 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) */ var targetLoginMethodIds = mutableListOf() /** - * A list of endpoint IDs that are still pending + * A map of endpoint ID to last sync time, that are still pending * to run. */ - var targetEndpointIds = mutableListOf() + var targetEndpointIds = sortedMapOf() /** * A count of all network requests to do. */ @@ -117,11 +86,17 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) val lessonRanges = SparseArray() val gradeCategories = LongSparseArray() + var teacherOnConflictStrategy = OnConflictStrategy.IGNORE + var eventListReplace = false + var messageListReplace = false + var announcementListReplace = false + val classrooms = LongSparseArray() val attendanceTypes = LongSparseArray() val noticeTypes = LongSparseArray() val eventTypes = LongSparseArray() val teacherAbsenceTypes = LongSparseArray() + val librusLessons = LongSparseArray() private var mTeamClass: Team? = null var teamClass: Team? @@ -137,8 +112,6 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) var toRemove = mutableListOf() val lessonList = mutableListOf() - val lessonChangeList = mutableListOf() - val lessonNewList = mutableListOf() val gradeList = mutableListOf() @@ -155,17 +128,16 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) val teacherAbsenceList = mutableListOf() val messageList = mutableListOf() - val messageIgnoreList = mutableListOf() val messageRecipientList = mutableListOf() val messageRecipientIgnoreList = mutableListOf() val metadataList = mutableListOf() - val messageMetadataList = mutableListOf() + val setSeenMetadataList = mutableListOf() val db: AppDb by lazy { app.db } init { - if (App.devMode) { + if (App.debugMode) { fakeLogin = loginStore.hasLoginData("fakeLogin") } clear() @@ -179,6 +151,11 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) } } + private fun d(message: String) { + if (DEBUG) + Utils.d(TAG, message) + } + fun clear() { loginMethods.clear() @@ -195,68 +172,68 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) noticeTypes.clear() eventTypes.clear() teacherAbsenceTypes.clear() + librusLessons.clear() lessonList.clear() - lessonChangeList.clear() - lessonNewList.clear() gradeList.clear() noticeList.clear() attendanceList.clear() announcementList.clear() luckyNumberList.clear() teacherAbsenceList.clear() - messageIgnoreList.clear() + messageList.clear() messageRecipientList.clear() messageRecipientIgnoreList.clear() metadataList.clear() - messageMetadataList.clear() + setSeenMetadataList.clear() } open fun saveData() { if (profile == null) return // return on first login + val totalStart = System.currentTimeMillis() + var startTime = System.currentTimeMillis() + d("Saving data to DB") - profile.empty = false + profile.userCode = generateUserCode() + + // update profile subname with class name, school year and account type + profile.subname = joinNotNullStrings( + " - ", + profile.studentClassName, + "${profile.studentSchoolYearStart}/${profile.studentSchoolYearStart + 1}" + ) + " " + app.getString(if (profile.isParent) R.string.account_type_parent else R.string.account_type_child) db.profileDao().add(profile) db.loginStoreDao().add(loginStore) - if (profile.id == app.profile?.id) { + if (profile.id == app.profile.id) { app.profile.apply { name = profile.name subname = profile.subname syncEnabled = profile.syncEnabled - loggedIn = profile.loggedIn empty = profile.empty archived = profile.archived studentNameLong = profile.studentNameLong studentNameShort = profile.studentNameShort studentNumber = profile.studentNumber - studentData = profile.studentData - accountNameLong = profile.accountNameLong - yearAverageMode = profile.yearAverageMode - currentSemester = profile.currentSemester - attendancePercentage = profile.attendancePercentage + accountName = profile.accountName dateSemester1Start = profile.dateSemester1Start dateSemester2Start = profile.dateSemester2Start dateYearEnd = profile.dateYearEnd - luckyNumberEnabled = profile.luckyNumberEnabled - luckyNumber = profile.luckyNumber - luckyNumberDate = profile.luckyNumberDate - lastFullSync = profile.lastFullSync lastReceiversSync = profile.lastReceiversSync } } - if (loginStore.id == app.profile?.loginStoreId) { - app.loginStore = loginStore.data - app.profile.loginStoreData = loginStore.data - } + + d("Profiles saved in ${System.currentTimeMillis()-startTime} ms") + startTime = System.currentTimeMillis() // always present and not empty, during every sync db.endpointTimerDao().addAll(endpointTimers) - db.teacherDao().clear(profileId) - db.teacherDao().addAll(teacherList.values()) - db.subjectDao().clear(profileId) + if (teacherOnConflictStrategy == OnConflictStrategy.IGNORE) + db.teacherDao().addAllIgnore(teacherList.values()) + else if (teacherOnConflictStrategy == OnConflictStrategy.REPLACE) + db.teacherDao().addAll(teacherList.values()) db.subjectDao().addAll(subjectList.values()) db.teamDao().clear(profileId) db.teamDao().addAll(teamList.values()) @@ -265,6 +242,9 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) db.gradeCategoryDao().clear(profileId) db.gradeCategoryDao().addAll(gradeCategories.values()) + d("Maps saved in ${System.currentTimeMillis()-startTime} ms") + startTime = System.currentTimeMillis() + // may be empty - extracted from DB on demand, by an endpoint if (classrooms.size > 0) db.classroomDao().addAll(classrooms.values()) @@ -276,77 +256,60 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) db.eventTypeDao().addAll(eventTypes.values()) if (teacherAbsenceTypes.size > 0) db.teacherAbsenceTypeDao().addAll(teacherAbsenceTypes.values()) + if (librusLessons.size > 0) + db.librusLessonDao().addAll(librusLessons.values()) + + d("On-demand maps saved in ${System.currentTimeMillis()-startTime} ms") + startTime = System.currentTimeMillis() // clear DB with DataRemoveModels added by endpoints for (model in toRemove) { + d("Clearing DB with $model") when (model) { is DataRemoveModel.Timetable -> model.commit(profileId, db.timetableDao()) is DataRemoveModel.Grades -> model.commit(profileId, db.gradeDao()) is DataRemoveModel.Events -> model.commit(profileId, db.eventDao()) + is DataRemoveModel.Attendance -> model.commit(profileId, db.attendanceDao()) } } + d("DB cleared in ${System.currentTimeMillis()-startTime} ms") + startTime = System.currentTimeMillis() + if (metadataList.isNotEmpty()) db.metadataDao().addAllIgnore(metadataList) - if (messageMetadataList.isNotEmpty()) - db.metadataDao().setSeen(messageMetadataList) + if (setSeenMetadataList.isNotEmpty()) + db.metadataDao().setSeen(setSeenMetadataList) - // not extracted from DB - always new data - if (lessonList.isNotEmpty()) { - db.lessonDao().clear(profile.id) - db.lessonDao().addAll(lessonList) - } - if (lessonChangeList.isNotEmpty()) - db.lessonChangeDao().addAll(lessonChangeList) - if (lessonNewList.isNotEmpty()) { - db.timetableDao() += lessonNewList - } - if (gradeList.isNotEmpty()) { - db.gradeDao().addAll(gradeList) - } - if (eventList.isNotEmpty()) { - db.eventDao().addAll(eventList) - } + d("Metadata saved in ${System.currentTimeMillis()-startTime} ms") + startTime = System.currentTimeMillis() + + db.timetableDao().putAll(lessonList, removeNotKept = true) + db.gradeDao().putAll(gradeList, removeNotKept = true) + db.eventDao().putAll(eventList, forceReplace = eventListReplace, removeNotKept = true) if (noticeList.isNotEmpty()) { db.noticeDao().clear(profile.id) - db.noticeDao().addAll(noticeList) + db.noticeDao().putAll(noticeList) } - if (attendanceList.isNotEmpty()) - db.attendanceDao().addAll(attendanceList) - if (announcementList.isNotEmpty()) - db.announcementDao().addAll(announcementList) - if (luckyNumberList.isNotEmpty()) - db.luckyNumberDao().addAll(luckyNumberList) - if (teacherAbsenceList.isNotEmpty()) - db.teacherAbsenceDao().addAll(teacherAbsenceList) + db.attendanceDao().putAll(attendanceList, removeNotKept = true) + db.announcementDao().putAll(announcementList, forceReplace = announcementListReplace, removeNotKept = false) + db.luckyNumberDao().putAll(luckyNumberList) + db.teacherAbsenceDao().putAll(teacherAbsenceList) - if (messageList.isNotEmpty()) - db.messageDao().addAll(messageList) - if (messageIgnoreList.isNotEmpty()) - db.messageDao().addAllIgnore(messageIgnoreList) + db.messageDao().putAll(messageList, forceReplace = messageListReplace, removeNotKept = false) if (messageRecipientList.isNotEmpty()) db.messageRecipientDao().addAll(messageRecipientList) if (messageRecipientIgnoreList.isNotEmpty()) db.messageRecipientDao().addAllIgnore(messageRecipientIgnoreList) - } - fun notify(onSuccess: () -> Unit) { - if (profile == null) { - onSuccess() - return - } - try { - DataNotifications(this) - db.notificationDao().addAll(notifications) - onSuccess() - } catch (e: Exception) { - error(ApiError(TAG, EXCEPTION_NOTIFY) - .withThrowable(e)) - } + d("Other data saved in ${System.currentTimeMillis()-startTime} ms") + + d("Total save time: ${System.currentTimeMillis()-totalStart} ms") } fun setSyncNext(endpointId: Int, syncIn: Long? = null, viewId: Int? = null, syncAt: Long? = null) { - EndpointTimer(profile?.id ?: -1, endpointId).apply { + EndpointTimer(profile?.id + ?: -1, endpointId).apply { syncedNow() if (syncIn != null) { @@ -365,17 +328,19 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) } } + abstract fun generateUserCode(): String + fun cancel() { - d("Data", "Cancelled") + d("Cancelled") cancelled = true saveData() } fun shouldSyncLuckyNumber(): Boolean { - return (db.luckyNumberDao().getNearestFutureNow(profileId, Date.getToday().value) ?: -1) == -1 + return db.luckyNumberDao().getNearestFutureNow(profileId, Date.getToday()) == null } - fun error(tag: String, errorCode: Int, response: Response? = null, throwable: Throwable? = null, apiResponse: JsonObject? = null) { + /*fun error(tag: String, errorCode: Int, response: Response? = null, throwable: Throwable? = null, apiResponse: JsonObject? = null) { val code = when (throwable) { is UnknownHostException, is SSLException, is InterruptedIOException -> CODE_NO_INTERNET is SocketTimeoutException -> CODE_TIMEOUT @@ -387,23 +352,21 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) error(ApiError(tag, code).apply { profileId = profile?.id ?: -1 }.withResponse(response).withThrowable(throwable).withApiResponse(apiResponse)) - } + }*/ fun error(tag: String, errorCode: Int, response: Response? = null, apiResponse: String? = null) { - val code = when (null) { - is UnknownHostException, is SSLException, is InterruptedIOException -> CODE_NO_INTERNET - is SocketTimeoutException -> CODE_TIMEOUT - else -> when (response?.code()) { - 400, 401, 424, 500, 503, 404 -> CODE_MAINTENANCE - else -> errorCode - } - } - error(ApiError(tag, code).apply { + error(ApiError(tag, errorCode).apply { profileId = profile?.id ?: -1 }.withResponse(response).withApiResponse(apiResponse)) } fun error(apiError: ApiError) { + apiError.errorCode = apiError.throwable?.toErrorCode() ?: + if (apiError.errorCode == ERROR_REQUEST_FAILURE) + apiError.response?.toErrorCode() ?: apiError.errorCode + else + apiError.errorCode + callback.onError(apiError) } @@ -414,4 +377,108 @@ open class Data(val app: App, val profile: Profile?, val loginStore: LoginStore) fun startProgress(stringRes: Int) { callback.onStartProgress(stringRes) } + + /* _ _ _ _ _ + | | | | | (_) | + | | | | |_ _| |___ + | | | | __| | / __| + | |__| | |_| | \__ \ + \____/ \__|_|_|__*/ + fun getSubject(id: Long?, name: String, shortName: String = name): Subject { + var subject = subjectList.singleOrNull { it.id == id } + if (subject == null) + subject = subjectList.singleOrNull { it.longName == name } + if (subject == null) + subject = subjectList.singleOrNull { it.shortName == name } + + if (subject == null) { + subject = Subject( + profileId, + id ?: name.crc32(), + name, + shortName + ) + subjectList[subject.id] = subject + } + return subject + } + + fun getTeam(id: Long?, name: String, schoolCode: String, isTeamClass: Boolean = false): Team { + if (isTeamClass && teamClass != null) + return teamClass as Team + var team = teamList.singleOrNull { it.id == id } + + val namePlain = name.replace(" ", "") + if (team == null) + team = teamList.singleOrNull { it.name.replace(" ", "") == namePlain } + + if (team == null) { + team = Team( + profileId, + id ?: name.crc32(), + name, + if (isTeamClass) Team.TYPE_CLASS else Team.TYPE_VIRTUAL, + "$schoolCode:$name", + -1 + ) + teamList[team.id] = team + } + return team + } + + fun getTeacher(firstName: String, lastName: String, loginId: String? = null): Teacher { + val teacher = teacherList.singleOrNull { it.fullName == "$firstName $lastName" } + return validateTeacher(teacher, firstName, lastName, loginId) + } + + fun getTeacher(firstNameChar: Char, lastName: String, loginId: String? = null): Teacher { + val teacher = teacherList.singleOrNull { it.shortName == "$firstNameChar.$lastName" } + return validateTeacher(teacher, firstNameChar.toString(), lastName, loginId) + } + + fun getTeacherByLastFirst(nameLastFirst: String, loginId: String? = null): Teacher { + val nameParts = nameLastFirst.split(" ") + return if (nameParts.size == 1) + getTeacher(nameParts[0], "", loginId) + else + getTeacher(nameParts[1], nameParts[0], loginId) + } + + fun getTeacherByFirstLast(nameFirstLast: String, loginId: String? = null): Teacher { + val nameParts = nameFirstLast.split(" ") + return if (nameParts.size == 1) + getTeacher(nameParts[0], "", loginId) + else + getTeacher(nameParts[0], nameParts[1], loginId) + } + + fun getTeacherByFDotLast(nameFDotLast: String, loginId: String? = null): Teacher { + val nameParts = nameFDotLast.split(".") + return if (nameParts.size == 1) + getTeacher(nameParts[0], "", loginId) + else + getTeacher(nameParts[0][0], nameParts[1], loginId) + } + + fun getTeacherByFDotSpaceLast(nameFDotSpaceLast: String, loginId: String? = null): Teacher { + val nameParts = nameFDotSpaceLast.split(".") + return if (nameParts.size == 1) + getTeacher(nameParts[0], "", loginId) + else + getTeacher(nameParts[0][0], nameParts[1], loginId) + } + + private fun validateTeacher(teacher: Teacher?, firstName: String, lastName: String, loginId: String?): Teacher { + val obj = teacher ?: Teacher(profileId, -1, firstName, lastName, loginId).apply { + id = fullName.crc32() + teacherList[id] = this + } + return obj.also { + if (loginId != null && it.loginId != null) + it.loginId = loginId + if (firstName.length > 1) + it.name = firstName + it.surname = lastName + } + } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/DataRemoveModel.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/DataRemoveModel.kt index 2cbd67d9..49b57999 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/DataRemoveModel.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/DataRemoveModel.kt @@ -4,13 +4,14 @@ package pl.szczodrzynski.edziennik.data.api.models -import pl.szczodrzynski.edziennik.data.db.modules.events.EventDao -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeDao -import pl.szczodrzynski.edziennik.data.db.modules.timetable.TimetableDao +import pl.szczodrzynski.edziennik.data.db.dao.AttendanceDao +import pl.szczodrzynski.edziennik.data.db.dao.EventDao +import pl.szczodrzynski.edziennik.data.db.dao.GradeDao +import pl.szczodrzynski.edziennik.data.db.dao.TimetableDao import pl.szczodrzynski.edziennik.utils.models.Date open class DataRemoveModel { - class Timetable(private val dateFrom: Date?, private val dateTo: Date?) : DataRemoveModel() { + data class Timetable(private val dateFrom: Date?, private val dateTo: Date?) : DataRemoveModel() { companion object { fun from(dateFrom: Date) = Timetable(dateFrom, null) fun to(dateTo: Date) = Timetable(null, dateTo) @@ -19,37 +20,60 @@ open class DataRemoveModel { fun commit(profileId: Int, dao: TimetableDao) { if (dateFrom != null && dateTo != null) { - dao.clearBetweenDates(profileId, dateFrom, dateTo) + dao.dontKeepBetweenDates(profileId, dateFrom, dateTo) } else { - dateFrom?.let { dateFrom -> dao.clearFromDate(profileId, dateFrom) } - dateTo?.let { dateTo -> dao.clearToDate(profileId, dateTo) } + dateFrom?.let { dateFrom -> dao.dontKeepFromDate(profileId, dateFrom) } + dateTo?.let { dateTo -> dao.dontKeepToDate(profileId, dateTo) } } } } - class Grades(private val all: Boolean, private val semester: Int?) : DataRemoveModel() { + data class Grades(private val all: Boolean, private val semester: Int?, private val type: Int?) : DataRemoveModel() { companion object { - fun all() = Grades(true, null) - fun semester(semester: Int) = Grades(false, semester) + fun all() = Grades(true, null, null) + fun allWithType(type: Int) = Grades(true, null, type) + fun semester(semester: Int) = Grades(false, semester, null) + fun semesterWithType(semester: Int, type: Int) = Grades(false, semester, type) } fun commit(profileId: Int, dao: GradeDao) { if (all) { - dao.clear(profileId) + if (type != null) dao.dontKeepWithType(profileId, type) + else dao.clear(profileId) + } + semester?.let { + if (type != null) dao.dontKeepForSemesterWithType(profileId, it, type) + else dao.dontKeepForSemester(profileId, it) } - semester?.let { dao.clearForSemester(profileId, it) } } } - class Events(private val type: Int?, private val exceptType: Int?) : DataRemoveModel() { + data class Events(private val type: Long?, private val exceptType: Long?, private val exceptTypes: List?) : DataRemoveModel() { companion object { - fun futureExceptType(exceptType: Int) = Events(null, exceptType) - fun futureWithType(type: Int) = Events(type, null) + fun futureExceptType(exceptType: Long) = Events(null, exceptType, null) + fun futureExceptTypes(exceptTypes: List) = Events(null, null, exceptTypes) + fun futureWithType(type: Long) = Events(type, null, null) + fun future() = Events(null, null, null) } fun commit(profileId: Int, dao: EventDao) { - type?.let { dao.removeFutureWithType(profileId, Date.getToday(), it) } - exceptType?.let { dao.removeFutureExceptType(profileId, Date.getToday(), it) } + type?.let { dao.dontKeepFutureWithType(profileId, Date.getToday(), it) } + exceptType?.let { dao.dontKeepFutureExceptType(profileId, Date.getToday(), it) } + exceptTypes?.let { dao.dontKeepFutureExceptTypes(profileId, Date.getToday(), it) } + if (type == null && exceptType == null && exceptTypes == null) + dao.dontKeepFuture(profileId, Date.getToday()) + } + } + + data class Attendance(private val dateFrom: Date?) : DataRemoveModel() { + companion object { + fun from(dateFrom: Date) = Attendance(dateFrom) + } + + fun commit(profileId: Int, dao: AttendanceDao) { + if (dateFrom != null) { + dao.dontKeepAfterDate(profileId, dateFrom) + } } } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/LoginMethod.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/LoginMethod.kt index e5efbd0c..cf899cff 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/LoginMethod.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/models/LoginMethod.kt @@ -5,8 +5,8 @@ package pl.szczodrzynski.edziennik.data.api.models import pl.szczodrzynski.edziennik.data.api.LOGIN_METHOD_NOT_NEEDED -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore +import pl.szczodrzynski.edziennik.data.db.entity.Profile /** * A Login Method descriptor class. diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/Szkolny.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/Szkolny.kt deleted file mode 100644 index 867d2690..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/Szkolny.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) Kacper Ziubryniewicz 2019-12-13 - */ - -package pl.szczodrzynski.edziennik.data.api.szkolny - -import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull - -class Szkolny(val app: App, val callback: EdziennikCallback) { - - private val api = SzkolnyApi(app) - - fun sync(profiles: List) { - if (profiles.isNotEmpty()) { - val events = api.getEvents(profiles) - - if (events.isNotEmpty()) { - app.db.eventDao().addAll(events) - app.db.metadataDao().addAllIgnore(events.map { event -> - Metadata( - event.profileId, - Metadata.TYPE_EVENT, - event.id, - event.seen, - event.notified, - event.addedDate - ) - }) - } - } - - completed() - } - - fun shareEvent(event: EventFull) { - api.shareEvent(event) - completed() - } - - fun unshareEvent(event: EventFull) { - api.unshareEvent(event) - completed() - } - - private fun completed() { - callback.onCompleted() - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt index af126adf..da64cbc3 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApi.kt @@ -5,32 +5,58 @@ package pl.szczodrzynski.edziennik.data.api.szkolny import android.os.Build +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.google.gson.GsonBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.withContext import okhttp3.OkHttpClient -import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.BuildConfig +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.ERROR_API_INVALID_SIGNATURE import pl.szczodrzynski.edziennik.data.api.szkolny.adapter.DateAdapter import pl.szczodrzynski.edziennik.data.api.szkolny.adapter.TimeAdapter +import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.ApiCacheInterceptor import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.SignatureInterceptor -import pl.szczodrzynski.edziennik.data.api.szkolny.request.EventShareRequest -import pl.szczodrzynski.edziennik.data.api.szkolny.request.ServerSyncRequest -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull +import pl.szczodrzynski.edziennik.data.api.szkolny.interceptor.Signing +import pl.szczodrzynski.edziennik.data.api.szkolny.request.* +import pl.szczodrzynski.edziennik.data.api.szkolny.response.* +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage +import pl.szczodrzynski.edziennik.data.db.entity.Notification +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.ui.modules.error.ErrorDetailsDialog +import pl.szczodrzynski.edziennik.ui.modules.error.ErrorSnackbar +import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time +import retrofit2.Response import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory import retrofit2.create import java.util.concurrent.TimeUnit.SECONDS +import kotlin.coroutines.CoroutineContext -class SzkolnyApi(val app: App) { +class SzkolnyApi(val app: App) : CoroutineScope { + companion object { + const val TAG = "SzkolnyApi" + } private val api: SzkolnyService + private val retrofit: Retrofit + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main init { val okHttpClient: OkHttpClient = app.http.newBuilder() .followRedirects(true) - .callTimeout(30, SECONDS) + .callTimeout(10, SECONDS) + .addInterceptor(ApiCacheInterceptor(app)) .addInterceptor(SignatureInterceptor(app)) .build() @@ -41,7 +67,7 @@ class SzkolnyApi(val app: App) { .registerTypeAdapter(Time::class.java, TimeAdapter()) .create()) - val retrofit: Retrofit = Retrofit.Builder() + retrofit = Retrofit.Builder() .baseUrl("https://api.szkolny.eu/") .addConverterFactory(gsonConverterFactory) .client(okHttpClient) @@ -50,75 +76,318 @@ class SzkolnyApi(val app: App) { api = retrofit.create() } - fun getEvents(profiles: List): List { - val teams = app.db.teamDao().allNow - val notifications = app.db.notificationDao().getNotPostedNow() + suspend inline fun runCatching(errorSnackbar: ErrorSnackbar, crossinline block: SzkolnyApi.() -> T?): T? { + return try { + withContext(Dispatchers.Default) { block.invoke(this@SzkolnyApi) } + } + catch (e: Exception) { + errorSnackbar.addError(e.toApiError(TAG)).show() + null + } + } + suspend inline fun runCatching(activity: AppCompatActivity, crossinline block: SzkolnyApi.() -> T?): T? { + return try { + withContext(Dispatchers.Default) { block.invoke(this@SzkolnyApi) } + } + catch (e: Exception) { + withContext(coroutineContext) { + val apiError = e.toApiError(TAG) + if (apiError.errorCode == ERROR_API_INVALID_SIGNATURE) { + Toast.makeText(activity, R.string.error_no_api_access, Toast.LENGTH_SHORT).show() + return@withContext null + } + ErrorDetailsDialog( + activity, + listOf(apiError), + R.string.error_occured + ) + null + } + null + } + } + inline fun runCatching(block: SzkolnyApi.() -> T, onError: (e: Throwable) -> Unit): T? { + return try { + block.invoke(this@SzkolnyApi) + } + catch (e: Exception) { + onError(e) + null + } + } - val response = api.serverSync(ServerSyncRequest( - deviceId = app.deviceId, - device = ServerSyncRequest.Device( - osType = "Android", - osVersion = Build.VERSION.RELEASE, - hardware = "${Build.MANUFACTURER} ${Build.MODEL}", - pushToken = app.config.sync.tokenApp, - appVersion = BuildConfig.VERSION_NAME, - appType = BuildConfig.BUILD_TYPE, - appVersionCode = BuildConfig.VERSION_CODE, - syncInterval = app.config.sync.interval - ), - userCodes = profiles.map { it.usernameId }, - users = profiles.map { profile -> - ServerSyncRequest.User( - profile.usernameId, - profile.studentNameLong ?: "", - profile.studentNameShort ?: "", - profile.loginStoreType, - teams.filter { it.profileId == profile.id }.map { it.code } - ) - }, - notifications = notifications.map { ServerSyncRequest.Notification(it.profileName ?: "", it.type, it.text) } - )).execute().body() + /** + * Check if a server request returned a successful response. + * + * If not, throw a [SzkolnyApiException] containing an [ApiResponse.Error], + * or null if it's a HTTP call error. + */ + @Throws(Exception::class) + private inline fun parseResponse(response: Response>): T { + app.config.update = response.body()?.update?.let { update -> + if (update.versionCode > BuildConfig.VERSION_CODE) { + if (update.updateMandatory + && EventBus.getDefault().hasSubscriberForEvent(update::class.java)) { + EventBus.getDefault().postSticky(update) + } + update + } + else + null + } - val events = mutableListOf() + response.body()?.registerAvailability?.let { registerAvailability -> + app.config.sync.registerAvailability = registerAvailability + } - response?.data?.events?.forEach { event -> - teams.filter { it.code == event.teamCode }.forEach { team -> - val profile = profiles.firstOrNull { it.id == team.profileId } - - events.add(event.apply { - profileId = team.profileId - teamId = team.id - addedManually = true - seen = profile?.empty ?: false - notified = profile?.empty ?: false - - if (profile?.usernameId == event.sharedBy) sharedBy = "self" - }) + if (response.isSuccessful && response.body()?.success == true) { + if (Unit is T) { + return Unit + } + if (response.body()?.data != null) { + return response.body()?.data!! } } - return events + val body = response.body() ?: response.errorBody()?.let { + try { + retrofit.responseBodyConverter>(ApiResponse::class.java, arrayOf()).convert(it) + } + catch (e: Exception) { + null + } + } + + if (body?.errors?.any { it.toErrorCode() == ERROR_API_INVALID_SIGNATURE } == true) { + app.config.apiInvalidCert = Signing.appCertificate.md5() + } + + throw SzkolnyApiException(body?.errors?.firstOrNull()) } + @Throws(Exception::class) + private fun getDevice() = run { + val config = app.config + val device = Device( + osType = "Android", + osVersion = Build.VERSION.RELEASE, + hardware = "${Build.MANUFACTURER} ${Build.MODEL}", + pushToken = app.config.sync.tokenApp, + appVersion = BuildConfig.VERSION_NAME, + appType = BuildConfig.BUILD_TYPE, + appVersionCode = BuildConfig.VERSION_CODE, + syncInterval = app.config.sync.interval + ) + device.toString().md5().let { + if (it == config.hash) + null + else { + config.hash = it + device + } + } + } + + @Throws(Exception::class) + fun getEvents(profiles: List, notifications: List, blacklistedIds: List, lastSyncTime: Long): List { + val teams = app.db.teamDao().allNow + + val response = api.serverSync(ServerSyncRequest( + deviceId = app.deviceId, + device = getDevice(), + userCodes = profiles.map { it.userCode }, + users = profiles.mapNotNull { profile -> + val config = app.config.getFor(profile.id) + val user = ServerSyncRequest.User( + profile.userCode, + profile.studentNameLong, + profile.studentNameShort, + profile.loginStoreType, + teams.filter { it.profileId == profile.id }.map { it.code } + ) + user.toString().md5().let { + if (it == config.hash) + null + else { + config.hash = it + user + } + } + }, + lastSync = lastSyncTime, + notifications = notifications.map { ServerSyncRequest.Notification(it.profileName ?: "", it.type, it.text) } + )).execute() + val (events, hasBrowsers) = parseResponse(response) + + hasBrowsers?.let { + app.config.sync.webPushEnabled = it + } + + val eventList = mutableListOf() + + events.forEach { event -> + // skip blacklisted events + if (event.id in blacklistedIds) + return@forEach + + // force nullable non-negative colors + if (event.color == -1) + event.color = null + + // create the event for every matching team and profile + teams.filter { it.code == event.teamCode }.onEach { team -> + val profile = profiles.firstOrNull { it.id == team.profileId } ?: return@onEach + + eventList += EventFull(event).apply { + profileId = team.profileId + teamId = team.id + addedManually = true + seen = profile.empty + notified = profile.empty + + if (profile.userCode == event.sharedBy) sharedBy = "self" + } + } + } + + return eventList + } + + @Throws(Exception::class) fun shareEvent(event: EventFull) { val team = app.db.teamDao().getByIdNow(event.profileId, event.teamId) - api.shareEvent(EventShareRequest( + val response = api.shareEvent(EventShareRequest( deviceId = app.deviceId, + device = getDevice(), sharedByName = event.sharedByName, shareTeamCode = team.code, event = event )).execute() + parseResponse(response) } - fun unshareEvent(event: EventFull) { + @Throws(Exception::class) + fun unshareEvent(event: Event) { val team = app.db.teamDao().getByIdNow(event.profileId, event.teamId) - api.shareEvent(EventShareRequest( + val response = api.shareEvent(EventShareRequest( deviceId = app.deviceId, + device = getDevice(), sharedByName = event.sharedByName, unshareTeamCode = team.code, eventId = event.id )).execute() + parseResponse(response) + } + + /*fun eventEditRequest(requesterName: String, event: Event): ApiResponse? { + + }*/ + + @Throws(Exception::class) + fun pairBrowser(browserId: String?, pairToken: String?): List { + val response = api.webPush(WebPushRequest( + deviceId = app.deviceId, + device = getDevice(), + action = "pairBrowser", + browserId = browserId, + pairToken = pairToken + )).execute() + + return parseResponse(response).browsers + } + + @Throws(Exception::class) + fun listBrowsers(): List { + val response = api.webPush(WebPushRequest( + deviceId = app.deviceId, + device = getDevice(), + action = "listBrowsers" + )).execute() + + return parseResponse(response).browsers + } + + @Throws(Exception::class) + fun unpairBrowser(browserId: String): List { + val response = api.webPush(WebPushRequest( + deviceId = app.deviceId, + device = getDevice(), + action = "unpairBrowser", + browserId = browserId + )).execute() + + return parseResponse(response).browsers + } + + @Throws(Exception::class) + fun errorReport(errors: List) { + val response = api.errorReport(ErrorReportRequest( + deviceId = app.deviceId, + device = getDevice(), + appVersion = BuildConfig.VERSION_NAME, + errors = errors + )).execute() + parseResponse(response) + } + + @Throws(Exception::class) + fun unregisterAppUser(userCode: String) { + val response = api.appUser(AppUserRequest( + deviceId = app.deviceId, + device = getDevice(), + userCode = userCode + )).execute() + parseResponse(response) + } + + @Throws(Exception::class) + fun getUpdate(channel: String): List { + val response = api.updates(channel).execute() + return parseResponse(response) + } + + @Throws(Exception::class) + fun sendFeedbackMessage(senderName: String?, targetDeviceId: String?, text: String): FeedbackMessage { + val response = api.feedbackMessage(FeedbackMessageRequest( + deviceId = app.deviceId, + device = getDevice(), + senderName = senderName, + targetDeviceId = targetDeviceId, + text = text + )).execute() + + return parseResponse(response).message + } + + @Throws(Exception::class) + fun getRealms(registerName: String): List { + val response = api.fsLoginRealms(registerName).execute() + if (response.isSuccessful && response.body() != null) { + return response.body()!! + } + throw SzkolnyApiException(null) + } + + @Throws(Exception::class) + fun getContributors(): ContributorsResponse { + val response = api.contributors().execute() + if (response.isSuccessful && response.body() != null) { + return parseResponse(response) + } + throw SzkolnyApiException(null) + } + + @Throws(Exception::class) + fun getFirebaseToken(registerName: String): String { + val response = api.firebaseToken(registerName).execute() + return parseResponse(response) + } + + @Throws(Exception::class) + fun getRegisterAvailability(): Map { + val response = api.registerAvailability().execute() + return parseResponse(response) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApiException.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApiException.kt new file mode 100644 index 00000000..7e15873d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyApiException.kt @@ -0,0 +1,9 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-2-16. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny + +import pl.szczodrzynski.edziennik.data.api.szkolny.response.ApiResponse + +class SzkolnyApiException(val error: ApiResponse.Error?) : Exception(if (error == null) "Error body does not contain a valid Error." else "${error.code}: ${error.reason}") diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt index 73918e67..26a9a44e 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/SzkolnyService.kt @@ -4,13 +4,11 @@ package pl.szczodrzynski.edziennik.data.api.szkolny -import pl.szczodrzynski.edziennik.data.api.szkolny.request.EventShareRequest -import pl.szczodrzynski.edziennik.data.api.szkolny.request.ServerSyncRequest -import pl.szczodrzynski.edziennik.data.api.szkolny.response.ApiResponse -import pl.szczodrzynski.edziennik.data.api.szkolny.response.ServerSyncResponse +import pl.szczodrzynski.edziennik.data.api.szkolny.request.* +import pl.szczodrzynski.edziennik.data.api.szkolny.response.* +import pl.szczodrzynski.edziennik.ui.modules.login.LoginInfo import retrofit2.Call -import retrofit2.http.Body -import retrofit2.http.POST +import retrofit2.http.* interface SzkolnyService { @@ -18,5 +16,32 @@ interface SzkolnyService { fun serverSync(@Body request: ServerSyncRequest): Call> @POST("share") - fun shareEvent(@Body request: EventShareRequest): Call> + fun shareEvent(@Body request: EventShareRequest): Call> + + @POST("webPush") + fun webPush(@Body request: WebPushRequest): Call> + + @POST("errorReport") + fun errorReport(@Body request: ErrorReportRequest): Call> + + @POST("appUser") + fun appUser(@Body request: AppUserRequest): Call> + + @GET("contributors/android") + fun contributors(): Call> + + @GET("updates/app") + fun updates(@Query("channel") channel: String = "release"): Call>> + + @POST("feedbackMessage") + fun feedbackMessage(@Body request: FeedbackMessageRequest): Call> + + @GET("firebase/token/{registerName}") + fun firebaseToken(@Path("registerName") registerName: String): Call> + + @GET("registerAvailability") + fun registerAvailability(): Call>> + + @GET("https://szkolny-eu.github.io/FSLogin/realms/{registerName}.json") + fun fsLoginRealms(@Path("registerName") registerName: String): Call> } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/ApiCacheInterceptor.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/ApiCacheInterceptor.kt new file mode 100644 index 00000000..19a84546 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/ApiCacheInterceptor.kt @@ -0,0 +1,42 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-29. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny.interceptor + +import okhttp3.* +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.api.szkolny.response.ApiResponse +import pl.szczodrzynski.edziennik.md5 + +class ApiCacheInterceptor(val app: App) : Interceptor { + + override fun intercept(chain: Interceptor.Chain): Response { + val request = chain.request() + if (request.url().host() == "api.szkolny.eu" + && Signing.appCertificate.md5() == app.config.apiInvalidCert + && !app.buildManager.isSigned + ) { + val response = ApiResponse( + success = false, + errors = listOf(ApiResponse.Error("InvalidSignature", "")) + ) + + return Response.Builder() + .request(request) + .protocol(Protocol.HTTP_1_1) + .code(401) + .message("Unauthorized") + .addHeader("Content-Type", "application/json") + .body( + ResponseBody.create( + MediaType.parse("application/json"), + app.gson.toJson(response) + ) + ) + .build() + } + + return chain.proceed(request) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/SignatureInterceptor.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/SignatureInterceptor.kt index 8d2becf4..30d0ec7e 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/SignatureInterceptor.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/SignatureInterceptor.kt @@ -26,6 +26,8 @@ class SignatureInterceptor(val app: App) : Interceptor { .header("X-AppVersion", BuildConfig.VERSION_CODE.toString()) .header("X-Timestamp", timestamp.toString()) .header("X-Signature", sign(timestamp, body, url)) + .header("X-AppBuild", BuildConfig.BUILD_TYPE) + .header("X-AppFlavor", BuildConfig.FLAVOR) .build()) } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt index b2bd9b85..2df7f141 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/interceptor/Signing.kt @@ -39,13 +39,13 @@ object Signing { val appPassword by lazy { iLoveApple( "ThisIsOurHardWorkPleaseDoNotCopyOrSteal(c)2019.KubaSz".sha256(), - BuildConfig.VERSION_NAME, + BuildConfig.VERSION_NAME.substringBeforeLast('+'), BuildConfig.VERSION_CODE.toLong() ) } /*fun provideKey(param1: String, param2: Long): ByteArray {*/ fun pleaseStopRightNow(param1: String, param2: Long): ByteArray { - return "$param1.MTIzNDU2Nzg5MDz9LXSttO===.$param2".sha256() + return "$param1.MTIzNDU2Nzg5MDY8+Uq3So===.$param2".sha256() } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/AppUserRequest.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/AppUserRequest.kt new file mode 100644 index 00000000..7c9d59ea --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/AppUserRequest.kt @@ -0,0 +1,13 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-18. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny.request + +data class AppUserRequest( + val deviceId: String, + val device: Device? = null, + + val action: String = "unregister", + val userCode: String +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/Device.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/Device.kt new file mode 100644 index 00000000..3c297c9b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/Device.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-20. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny.request + +data class Device( + val osType: String, + val osVersion: String, + val hardware: String, + val pushToken: String?, + val appVersion: String, + val appType: String, + val appVersionCode: Int, + val syncInterval: Int +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ErrorReportRequest.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ErrorReportRequest.kt new file mode 100644 index 00000000..93795ec8 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ErrorReportRequest.kt @@ -0,0 +1,26 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-12-31. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny.request + +data class ErrorReportRequest( + val deviceId: String, + val device: Device? = null, + + val appVersion: String, + val errors: List +) { + data class Error( + val id: Long, + val tag: String, + val errorCode: Int, + val errorText: String?, + val errorReason: String?, + val stackTrace: String?, + val request: String?, + val response: String?, + val apiResponse: String?, + val isCritical: Boolean + ) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/EventShareRequest.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/EventShareRequest.kt index 90f5d75e..1977d1b2 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/EventShareRequest.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/EventShareRequest.kt @@ -4,16 +4,19 @@ package pl.szczodrzynski.edziennik.data.api.szkolny.request -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull +import pl.szczodrzynski.edziennik.data.db.full.EventFull data class EventShareRequest ( + val deviceId: String, + val device: Device? = null, val action: String = "event", - val deviceId: String, - val sharedByName: String, + /* If null, the server shows an error */ + val sharedByName: String?, val shareTeamCode: String? = null, val unshareTeamCode: String? = null, + val requesterName: String? = null, val eventId: Long? = null, val event: EventFull? = null diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/FeedbackMessageRequest.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/FeedbackMessageRequest.kt new file mode 100644 index 00000000..9548e0fd --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/FeedbackMessageRequest.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-21. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny.request + +data class FeedbackMessageRequest( + val deviceId: String, + val device: Device? = null, + + val senderName: String?, + val targetDeviceId: String?, + val text: String +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ServerSyncRequest.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ServerSyncRequest.kt index 3902153a..e287df06 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ServerSyncRequest.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/ServerSyncRequest.kt @@ -5,26 +5,16 @@ package pl.szczodrzynski.edziennik.data.api.szkolny.request data class ServerSyncRequest( - val deviceId: String, val device: Device? = null, val userCodes: List, val users: List? = null, + val lastSync: Long, + val notifications: List? = null ) { - data class Device( - val osType: String, - val osVersion: String, - val hardware: String, - val pushToken: String?, - val appVersion: String, - val appType: String, - val appVersionCode: Int, - val syncInterval: Int - ) - data class User( val userCode: String, val studentName: String, diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/WebPushRequest.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/WebPushRequest.kt new file mode 100644 index 00000000..225b8e08 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/request/WebPushRequest.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-12-19. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny.request + +data class WebPushRequest( + val deviceId: String, + val device: Device? = null, + + val action: String, + + val browserId: String? = null, + val pairToken: String? = null +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ApiResponse.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ApiResponse.kt index ac56f53f..0987dcef 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ApiResponse.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ApiResponse.kt @@ -10,7 +10,10 @@ data class ApiResponse ( val errors: List? = null, - val data: T? = null + val data: T? = null, + + val update: Update? = null, + val registerAvailability: Map? = null ) { data class Error (val code: String, val reason: String) } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ContributorsResponse.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ContributorsResponse.kt new file mode 100644 index 00000000..f824280a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ContributorsResponse.kt @@ -0,0 +1,20 @@ +package pl.szczodrzynski.edziennik.data.api.szkolny.response + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +data class ContributorsResponse( + val contributors: List, + val translators: List +) { + + @Parcelize + data class Item( + val login: String, + val name: String?, + val avatarUrl: String, + val profileUrl: String, + val itemUrl: String, + val contributions: Int? + ) : Parcelable +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/FeedbackMessageResponse.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/FeedbackMessageResponse.kt new file mode 100644 index 00000000..0ca526fb --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/FeedbackMessageResponse.kt @@ -0,0 +1,9 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-21. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny.response + +import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage + +data class FeedbackMessageResponse(val message: FeedbackMessage) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/RegisterAvailabilityStatus.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/RegisterAvailabilityStatus.kt new file mode 100644 index 00000000..82f2e050 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/RegisterAvailabilityStatus.kt @@ -0,0 +1,26 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-9-2. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny.response + +import pl.szczodrzynski.edziennik.BuildConfig +import pl.szczodrzynski.edziennik.DAY +import pl.szczodrzynski.edziennik.currentTimeUnix + +data class RegisterAvailabilityStatus( + val available: Boolean, + val name: String?, + val userMessage: Message?, + val nextCheckAt: Long = currentTimeUnix() + 7 * DAY, + val minVersionCode: Int = BuildConfig.VERSION_CODE +) { + data class Message( + val title: String, + val contentShort: String, + val contentLong: String, + val icon: String?, + val image: String?, + val url: String? + ) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ServerSyncResponse.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ServerSyncResponse.kt index e060ce41..0ed11f9c 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ServerSyncResponse.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/ServerSyncResponse.kt @@ -4,6 +4,9 @@ package pl.szczodrzynski.edziennik.data.api.szkolny.response -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull +import pl.szczodrzynski.edziennik.data.db.full.EventFull -data class ServerSyncResponse(val events: List) +data class ServerSyncResponse( + val events: List, + val hasBrowsers: Boolean? = null +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/UpdateResponse.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/UpdateResponse.kt new file mode 100644 index 00000000..63a8ce9d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/UpdateResponse.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-18. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny.response + +data class Update( + val versionCode: Int, + val versionName: String, + val releaseDate: String, + val releaseNotes: String?, + val releaseType: String, + val isOnGooglePlay: Boolean, + val downloadUrl: String?, + val updateMandatory: Boolean +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/WebPushResponse.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/WebPushResponse.kt new file mode 100644 index 00000000..d51f3be2 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/szkolny/response/WebPushResponse.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-12-19. + */ + +package pl.szczodrzynski.edziennik.data.api.szkolny.response + +data class WebPushResponse(val browsers: List) { + data class Browser( + val id: Int, + val browserId: String, + val userAgent: String, + val dateRegistered: String + ) +} \ No newline at end of file diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/AppSync.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/AppSync.kt new file mode 100644 index 00000000..15482c53 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/AppSync.kt @@ -0,0 +1,59 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-17. + */ + +package pl.szczodrzynski.edziennik.data.api.task + +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.api.ERROR_API_INVALID_SIGNATURE +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApiException +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Notification +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.toErrorCode +import pl.szczodrzynski.edziennik.utils.models.Date + +class AppSync(val app: App, val notifications: MutableList, val profiles: List, val api: SzkolnyApi) { + companion object { + private const val TAG = "AppSync" + } + + /** + * Run the app sync, sending all pending notifications + * and retrieving a list of shared events. + * + * Events are automatically saved to app database, + * along with corresponding metadata objects. + * + * @return a number of events inserted to DB, possibly needing a notification + */ + fun run(lastSyncTime: Long, markAsSeen: Boolean = false): Int { + val blacklistedIds = app.db.eventDao().blacklistedIds + val events = try { + api.getEvents(profiles, notifications, blacklistedIds, lastSyncTime) + } catch (e: SzkolnyApiException) { + if (e.toErrorCode() == ERROR_API_INVALID_SIGNATURE) + return 0 + throw e + } + + app.config.sync.lastAppSync = System.currentTimeMillis() + + if (events.isNotEmpty()) { + val today = Date.getToday() + app.db.metadataDao().addAllIgnore(events.map { event -> + val isPast = event.date < today + Metadata( + event.profileId, + Metadata.TYPE_EVENT, + event.id, + isPast || markAsSeen || event.seen, + isPast || markAsSeen || event.notified + ) + }) + return app.db.eventDao().upsertAll(events).size + } + return 0; + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/EdziennikTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/EdziennikTask.kt deleted file mode 100644 index c9a0bc5c..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/EdziennikTask.kt +++ /dev/null @@ -1,97 +0,0 @@ -package pl.szczodrzynski.edziennik.data.api.task - -import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.api.* -import pl.szczodrzynski.edziennik.data.api.edziennik.idziennik.Idziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.librus.Librus -import pl.szczodrzynski.edziennik.data.api.edziennik.mobidziennik.Mobidziennik -import pl.szczodrzynski.edziennik.data.api.edziennik.template.Template -import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.Vulcan -import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback -import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikInterface -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageFull - -open class EdziennikTask(override val profileId: Int, val request: Any) : IApiTask(profileId) { - companion object { - private const val TAG = "EdziennikTask" - - fun firstLogin(loginStore: LoginStore) = EdziennikTask(-1, FirstLoginRequest(loginStore)) - fun sync() = EdziennikTask(-1, SyncRequest()) - fun syncProfile(profileId: Int, viewIds: List>? = null, arguments: JsonObject? = null) = EdziennikTask(profileId, SyncProfileRequest(viewIds, arguments)) - fun syncProfileList(profileList: List) = EdziennikTask(-1, SyncProfileListRequest(profileList)) - fun messageGet(profileId: Int, message: MessageFull) = EdziennikTask(profileId, MessageGetRequest(message)) - fun announcementsRead(profileId: Int) = EdziennikTask(profileId, AnnouncementsReadRequest()) - fun attachmentGet(profileId: Int, message: Message, attachmentId: Long, attachmentName: String) = EdziennikTask(profileId, AttachmentGetRequest(message, attachmentId, attachmentName)) - } - - private lateinit var loginStore: LoginStore - - override fun prepare(app: App) { - if (request is FirstLoginRequest) { - // get the requested profile and login store - this.profile = null - loginStore = request.loginStore - // save the profile ID and name as the current task's - taskName = app.getString(R.string.edziennik_notification_api_first_login_title) - } else { - // get the requested profile and login store - val profile = app.db.profileDao().getFullByIdNow(profileId) - this.profile = profile - if (profile == null) { - return - } - val loginStore = app.db.loginStoreDao().getByIdNow(profile.loginStoreId) ?: return - this.loginStore = loginStore - // save the profile ID and name as the current task's - taskName = app.getString(R.string.edziennik_notification_api_sync_title_format, profile.name) - } - } - - private var edziennikInterface: EdziennikInterface? = null - - internal fun run(app: App, taskCallback: EdziennikCallback) { - edziennikInterface = when (loginStore.type) { - LOGIN_TYPE_LIBRUS -> Librus(app, profile, loginStore, taskCallback) - LOGIN_TYPE_MOBIDZIENNIK -> Mobidziennik(app, profile, loginStore, taskCallback) - LOGIN_TYPE_VULCAN -> Vulcan(app, profile, loginStore, taskCallback) - LOGIN_TYPE_IDZIENNIK -> Idziennik(app, profile, loginStore, taskCallback) - LOGIN_TYPE_TEMPLATE -> Template(app, profile, loginStore, taskCallback) - else -> null - } - if (edziennikInterface == null) { - return - } - - when (request) { - is SyncProfileRequest -> edziennikInterface?.sync( - featureIds = request.viewIds?.flatMap { Features.getIdsByView(it.first, it.second) } - ?: Features.getAllIds(), - viewId = request.viewIds?.get(0)?.first, - arguments = request.arguments) - is MessageGetRequest -> edziennikInterface?.getMessage(request.message) - is FirstLoginRequest -> edziennikInterface?.firstLogin() - is AnnouncementsReadRequest -> edziennikInterface?.markAllAnnouncementsAsRead() - is AttachmentGetRequest -> edziennikInterface?.getAttachment(request.message, request.attachmentId, request.attachmentName) - } - } - - override fun cancel() { - edziennikInterface?.cancel() - } - - override fun toString(): String { - return "EdziennikTask(profileId=$profileId, request=$request, edziennikInterface=$edziennikInterface)" - } - - data class FirstLoginRequest(val loginStore: LoginStore) - class SyncRequest - data class SyncProfileRequest(val viewIds: List>? = null, val arguments: JsonObject? = null) - data class SyncProfileListRequest(val profileList: List) - data class MessageGetRequest(val message: MessageFull) - class AnnouncementsReadRequest - data class AttachmentGetRequest(val message: Message, val attachmentId: Long, val attachmentName: String) -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/IApiTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/IApiTask.kt index 88a2abff..2bff4267 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/IApiTask.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/IApiTask.kt @@ -11,11 +11,11 @@ import android.os.Build.VERSION_CODES.O import org.greenrobot.eventbus.EventBus import pl.szczodrzynski.edziennik.App import pl.szczodrzynski.edziennik.data.api.ApiService -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull +import pl.szczodrzynski.edziennik.data.db.entity.Profile abstract class IApiTask(open val profileId: Int) { var taskId: Int = 0 - var profile: ProfileFull? = null + var profile: Profile? = null var taskName: String? = null /** @@ -39,4 +39,20 @@ abstract class IApiTask(open val profileId: Int) { override fun toString(): String { return "IApiTask(profileId=$profileId, taskId=$taskId, profile=$profile, taskName=$taskName)" } + + companion object { + fun enqueueAll(context: Context, tasks: List) { + if (tasks.isEmpty()) + return + Intent(context, ApiService::class.java).let { + if (SDK_INT >= O) + context.startForegroundService(it) + else + context.startService(it) + } + tasks.forEach { + EventBus.getDefault().postSticky(it) + } + } + } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/Notifications.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/Notifications.kt new file mode 100644 index 00000000..28b5c9e9 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/Notifications.kt @@ -0,0 +1,356 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-16. + */ + +package pl.szczodrzynski.edziennik.data.api.task + +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.entity.* +import pl.szczodrzynski.edziennik.getNotificationTitle +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Week + +class Notifications(val app: App, val notifications: MutableList, val profiles: List) { + companion object { + private const val TAG = "Notifications" + } + + private val today by lazy { Date.getToday() } + private val todayValue by lazy { today.value } + + /** + * Create a [Notification] from every possible + * data type. Notifications are posted whenever + * the object's metadata `notified` property is + * set to false. + */ + fun run() { + timetableNotifications() + eventNotifications() + gradeNotifications() + behaviourNotifications() + attendanceNotifications() + announcementNotifications() + messageNotifications() + luckyNumberNotifications() + teacherAbsenceNotifications() + } + + private fun timetableNotifications() { + for (lesson in app.db.timetableDao().getNotNotifiedNow().filter { it.displayDate == null || it.displayDate!! >= today }) { + val text = app.getString( + R.string.notification_lesson_change_format, + lesson.getDisplayChangeType(app), + lesson.displayDate?.formattedString ?: "", + lesson.changeSubjectName + ) + val textLong = app.getString( + R.string.notification_lesson_change_long_format, + lesson.getDisplayChangeType(app), + lesson.displayDate?.formattedString ?: "-", + lesson.displayDate?.weekDay?.let { Week.getFullDayName(it) } ?: "-", + lesson.changeSubjectName, + lesson.changeTeacherName + ) + notifications += Notification( + id = Notification.buildId(lesson.profileId, Notification.TYPE_TIMETABLE_LESSON_CHANGE, lesson.id), + title = app.getNotificationTitle(Notification.TYPE_TIMETABLE_LESSON_CHANGE), + text = text, + textLong = textLong, + type = Notification.TYPE_TIMETABLE_LESSON_CHANGE, + profileId = lesson.profileId, + profileName = profiles.singleOrNull { it.id == lesson.profileId }?.name, + viewId = MainActivity.DRAWER_ITEM_TIMETABLE, + addedDate = System.currentTimeMillis() + ).addExtra("timetableDate", lesson.displayDate?.stringY_m_d ?: "") + } + } + + private fun eventNotifications() { + for (event in app.db.eventDao().getNotNotifiedNow().filter { it.date >= today }) { + val text = if (event.type == Event.TYPE_HOMEWORK) + app.getString( + if (event.subjectLongName.isNullOrEmpty()) + R.string.notification_homework_no_subject_format + else + R.string.notification_homework_format, + event.subjectLongName, + event.date.formattedString + ) + else + app.getString( + if (event.subjectLongName.isNullOrEmpty()) + R.string.notification_event_no_subject_format + else + R.string.notification_event_format, + event.typeName ?: "wydarzenie", + event.date.formattedString, + event.subjectLongName + ) + val textLong = app.getString( + R.string.notification_event_long_format, + event.typeName ?: "-", + event.subjectLongName ?: "-", + event.date.formattedString, + Week.getFullDayName(event.date.weekDay), + event.time?.stringHM ?: app.getString(R.string.event_all_day), + event.topic.take(200) + ) + val type = if (event.type == Event.TYPE_HOMEWORK) Notification.TYPE_NEW_HOMEWORK else Notification.TYPE_NEW_EVENT + notifications += Notification( + id = Notification.buildId(event.profileId, type, event.id), + title = app.getNotificationTitle(type), + text = text, + textLong = textLong, + type = type, + profileId = event.profileId, + profileName = profiles.singleOrNull { it.id == event.profileId }?.name, + viewId = if (event.type == Event.TYPE_HOMEWORK) MainActivity.DRAWER_ITEM_HOMEWORK else MainActivity.DRAWER_ITEM_AGENDA, + addedDate = event.addedDate + ).addExtra("eventId", event.id).addExtra("eventDate", event.date.value.toLong()) + } + } + + fun sharedEventNotifications() { + for (event in app.db.eventDao().getNotNotifiedNow().filter { it.date >= today && it.sharedBy != null }) { + val text = app.getString( + R.string.notification_shared_event_format, + event.sharedByName, + event.typeName ?: "wydarzenie", + event.date.formattedString, + event.topic + ) + val textLong = app.getString( + R.string.notification_shared_event_long_format, + event.sharedByName, + event.typeName ?: "-", + event.subjectLongName ?: "-", + event.date.formattedString, + Week.getFullDayName(event.date.weekDay), + event.time?.stringHM ?: app.getString(R.string.event_all_day), + event.topic.take(200) + ) + val type = if (event.type == Event.TYPE_HOMEWORK) Notification.TYPE_NEW_HOMEWORK else Notification.TYPE_NEW_EVENT + notifications += Notification( + id = Notification.buildId(event.profileId, type, event.id), + title = app.getNotificationTitle(type), + text = text, + textLong = textLong, + type = type, + profileId = event.profileId, + profileName = profiles.singleOrNull { it.id == event.profileId }?.name, + viewId = if (event.type == Event.TYPE_HOMEWORK) MainActivity.DRAWER_ITEM_HOMEWORK else MainActivity.DRAWER_ITEM_AGENDA, + addedDate = event.addedDate + ).addExtra("eventId", event.id).addExtra("eventDate", event.date.value.toLong()) + } + } + + private fun gradeNotifications() { + for (grade in app.db.gradeDao().getNotNotifiedNow()) { + val gradeName = when (grade.type) { + Grade.TYPE_SEMESTER1_PROPOSED, Grade.TYPE_SEMESTER2_PROPOSED -> app.getString(R.string.grade_semester_proposed_format_2, grade.name) + Grade.TYPE_SEMESTER1_FINAL, Grade.TYPE_SEMESTER2_FINAL -> app.getString(R.string.grade_semester_final_format_2, grade.name) + Grade.TYPE_YEAR_PROPOSED -> app.getString(R.string.grade_year_proposed_format_2, grade.name) + Grade.TYPE_YEAR_FINAL -> app.getString(R.string.grade_year_final_format_2, grade.name) + else -> grade.name + } + val text = app.getString( + R.string.notification_grade_format, + gradeName, + grade.subjectLongName + ) + val textLong = app.getString( + R.string.notification_grade_long_format, + gradeName, + grade.weight.toString(), + grade.subjectLongName ?: "-", + grade.category ?: "-", + grade.description ?: "-", + grade.teacherName ?: "-" + ) + notifications += Notification( + id = Notification.buildId(grade.profileId, Notification.TYPE_NEW_GRADE, grade.id), + title = app.getNotificationTitle(Notification.TYPE_NEW_GRADE), + text = text, + textLong = textLong, + type = Notification.TYPE_NEW_GRADE, + profileId = grade.profileId, + profileName = profiles.singleOrNull { it.id == grade.profileId }?.name, + viewId = MainActivity.DRAWER_ITEM_GRADES, + addedDate = grade.addedDate + ).addExtra("gradeId", grade.id).addExtra("gradesSubjectId", grade.subjectId) + } + } + + private fun behaviourNotifications() { + for (notice in app.db.noticeDao().getNotNotifiedNow()) { + + val noticeTypeStr = when (notice.type) { + Notice.TYPE_POSITIVE -> app.getString(R.string.notification_notice_praise) + Notice.TYPE_NEGATIVE -> app.getString(R.string.notification_notice_warning) + else -> app.getString(R.string.notification_notice_new) + } + + val text = app.getString( + R.string.notification_notice_format, + noticeTypeStr, + notice.teacherName, + Date.fromMillis(notice.addedDate).formattedString + ) + val textLong = app.getString( + R.string.notification_notice_long_format, + noticeTypeStr, + notice.teacherName ?: "-", + notice.text.take(200) + ) + notifications += Notification( + id = Notification.buildId(notice.profileId, Notification.TYPE_NEW_NOTICE, notice.id), + title = app.getNotificationTitle(Notification.TYPE_NEW_NOTICE), + text = text, + textLong = textLong, + type = Notification.TYPE_NEW_NOTICE, + profileId = notice.profileId, + profileName = profiles.singleOrNull { it.id == notice.profileId }?.name, + viewId = MainActivity.DRAWER_ITEM_BEHAVIOUR, + addedDate = notice.addedDate + ).addExtra("noticeId", notice.id) + } + } + + private fun attendanceNotifications() { + for (attendance in app.db.attendanceDao().getNotNotifiedNow()) { + + val attendanceTypeStr = when (attendance.baseType) { + Attendance.TYPE_ABSENT -> app.getString(R.string.notification_absence) + Attendance.TYPE_ABSENT_EXCUSED -> app.getString(R.string.notification_absence_excused) + Attendance.TYPE_BELATED -> app.getString(R.string.notification_belated) + Attendance.TYPE_BELATED_EXCUSED -> app.getString(R.string.notification_belated_excused) + Attendance.TYPE_RELEASED -> app.getString(R.string.notification_release) + Attendance.TYPE_DAY_FREE -> app.getString(R.string.notification_day_free) + else -> app.getString(R.string.notification_type_attendance) + } + + val text = app.getString( + if (attendance.subjectLongName.isNullOrEmpty()) + R.string.notification_attendance_no_lesson_format + else + R.string.notification_attendance_format, + attendanceTypeStr, + attendance.subjectLongName, + attendance.date.formattedString + ) + val textLong = app.getString( + R.string.notification_attendance_long_format, + attendanceTypeStr, + attendance.date.formattedString, + attendance.startTime?.stringHM ?: "-", + attendance.lessonNumber ?: "-", + attendance.subjectLongName ?: "-", + attendance.teacherName ?: "-", + attendance.lessonTopic ?: "-" + ) + notifications += Notification( + id = Notification.buildId(attendance.profileId, Notification.TYPE_NEW_ATTENDANCE, attendance.id), + title = app.getNotificationTitle(Notification.TYPE_NEW_ATTENDANCE), + text = text, + textLong = textLong, + type = Notification.TYPE_NEW_ATTENDANCE, + profileId = attendance.profileId, + profileName = profiles.singleOrNull { it.id == attendance.profileId }?.name, + viewId = MainActivity.DRAWER_ITEM_ATTENDANCE, + addedDate = attendance.addedDate + ).addExtra("attendanceId", attendance.id).addExtra("attendanceSubjectId", attendance.subjectId) + } + } + + private fun announcementNotifications() { + for (announcement in app.db.announcementDao().getNotNotifiedNow()) { + val text = app.getString( + R.string.notification_announcement_format, + announcement.teacherName, + announcement.subject + ) + notifications += Notification( + id = Notification.buildId(announcement.profileId, Notification.TYPE_NEW_ANNOUNCEMENT, announcement.id), + title = app.getNotificationTitle(Notification.TYPE_NEW_ANNOUNCEMENT), + text = text, + type = Notification.TYPE_NEW_ANNOUNCEMENT, + profileId = announcement.profileId, + profileName = profiles.singleOrNull { it.id == announcement.profileId }?.name, + viewId = MainActivity.DRAWER_ITEM_ANNOUNCEMENTS, + addedDate = announcement.addedDate + ).addExtra("announcementId", announcement.id) + } + } + + private fun messageNotifications() { + for (message in app.db.messageDao().getNotNotifiedNow()) { + val text = app.getString( + R.string.notification_message_format, + message.senderName, + message.subject + ) + notifications += Notification( + id = Notification.buildId(message.profileId, Notification.TYPE_NEW_MESSAGE, message.id), + title = app.getNotificationTitle(Notification.TYPE_NEW_MESSAGE), + text = text, + type = Notification.TYPE_NEW_MESSAGE, + profileId = message.profileId, + profileName = profiles.singleOrNull { it.id == message.profileId }?.name, + viewId = MainActivity.DRAWER_ITEM_MESSAGES, + addedDate = message.addedDate + ).addExtra("messageType", Message.TYPE_RECEIVED.toLong()).addExtra("messageId", message.id) + } + } + + private fun luckyNumberNotifications() { + val luckyNumbers = app.db.luckyNumberDao().getNotNotifiedNow().toMutableList() + luckyNumbers.removeAll { it.date < today } + luckyNumbers.forEach { luckyNumber -> + val profile = profiles.singleOrNull { it.id == luckyNumber.profileId } ?: return@forEach + val text = when (profile.studentNumber != -1 && profile.studentNumber == luckyNumber.number) { + true -> when (luckyNumber.date.value) { + todayValue -> R.string.notification_lucky_number_yours_format + todayValue + 1 -> R.string.notification_lucky_number_yours_tomorrow_format + else -> R.string.notification_lucky_number_yours_later_format + } + else -> when (luckyNumber.date.value) { + todayValue -> R.string.notification_lucky_number_format + todayValue + 1 -> R.string.notification_lucky_number_tomorrow_format + else -> R.string.notification_lucky_number_later_format + } + } + notifications += Notification( + id = Notification.buildId(luckyNumber.profileId, Notification.TYPE_LUCKY_NUMBER, luckyNumber.date.value.toLong()), + title = app.getNotificationTitle(Notification.TYPE_LUCKY_NUMBER), + text = app.getString(text, luckyNumber.date.formattedString, luckyNumber.number), + type = Notification.TYPE_LUCKY_NUMBER, + profileId = luckyNumber.profileId, + profileName = profile.name, + viewId = MainActivity.DRAWER_ITEM_HOME, + addedDate = System.currentTimeMillis() + ) + } + } + + private fun teacherAbsenceNotifications() { + for (teacherAbsence in app.db.teacherAbsenceDao().getNotNotifiedNow()) { + val message = app.getString( + R.string.notification_teacher_absence_new_format, + teacherAbsence.teacherName + ) + notifications += Notification( + id = Notification.buildId(teacherAbsence.profileId, Notification.TYPE_TEACHER_ABSENCE, teacherAbsence.id), + title = app.getNotificationTitle(Notification.TYPE_TEACHER_ABSENCE), + text = message, + type = Notification.TYPE_TEACHER_ABSENCE, + profileId = teacherAbsence.profileId, + profileName = profiles.singleOrNull { it.id == teacherAbsence.profileId }?.name, + viewId = MainActivity.DRAWER_ITEM_AGENDA, + addedDate = teacherAbsence.addedDate + ).addExtra("eventDate", teacherAbsence.dateFrom.value.toLong()) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt deleted file mode 100644 index d06c4a9d..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/NotifyTask.kt +++ /dev/null @@ -1,90 +0,0 @@ -package pl.szczodrzynski.edziennik.data.api.task - -import android.app.PendingIntent -import android.content.Intent -import android.os.Build -import androidx.core.app.NotificationCompat -import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.MainActivity -import pl.szczodrzynski.edziennik.Notifier.ID_NOTIFICATIONS -import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback -import pl.szczodrzynski.edziennik.data.db.modules.notification.getNotificationTitle -import pl.szczodrzynski.edziennik.utils.models.Notification -import kotlin.math.min - -class NotifyTask : IApiTask(-1) { - override fun prepare(app: App) { - taskName = app.getString(R.string.edziennik_notification_api_notify_title) - } - - override fun cancel() { - - } - - fun run(app: App, taskCallback: EdziennikCallback) { - val list = app.db.notificationDao().getNotPostedNow() - val notificationList = list.subList(0, min(10, list.size)) - - var unreadCount = list.size - - for (notification in notificationList) { - val intent = Intent(app, MainActivity::class.java) - notification.fillIntent(intent) - val pendingIntent = PendingIntent.getActivity(app, notification.id, intent, 0) - val notificationBuilder = NotificationCompat.Builder(app, app.notifier.notificationGroup) - // title, text, type, date - .setContentTitle(notification.profileName) - .setContentText(notification.text) - .setSubText(app.getNotificationTitle(notification.type)) - .setWhen(notification.addedDate) - .setTicker(app.getString(R.string.notification_ticker_format, Notification.stringType(app, notification.type))) - // icon, color, lights, priority - .setSmallIcon(R.drawable.ic_notification) - .setColor(app.notifier.notificationColor) - .setLights(-0xff0001, 2000, 2000) - .setPriority(app.notifier.notificationPriority) - // channel, group, style - .setChannelId(app.notifier.notificationGroup) - .setGroup(app.notifier.notificationGroup) - .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY) - .setStyle(NotificationCompat.BigTextStyle().bigText(notification.text)) - // intent, auto cancel - .setContentIntent(pendingIntent) - .setAutoCancel(true) - if (!app.notifier.shouldBeQuiet()) { - notificationBuilder.setDefaults(app.notifier.notificationDefaults) - } - app.notifier.notificationManager.notify(notification.id, notificationBuilder.build()) - } - - if (notificationList.isNotEmpty() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - val intent = Intent(app, MainActivity::class.java) - intent.action = "android.intent.action.MAIN" - intent.putExtra("fragmentId", MainActivity.DRAWER_ITEM_NOTIFICATIONS) - val pendingIntent = PendingIntent.getActivity(app, ID_NOTIFICATIONS, - intent, 0) - - val groupBuilder = NotificationCompat.Builder(app, app.notifier.notificationGroup) - .setSmallIcon(R.drawable.ic_notification) - .setColor(app.notifier.notificationColor) - .setContentTitle(app.getString(R.string.notification_new_notification_title_format, unreadCount)) - .setGroupSummary(true) - .setAutoCancel(true) - .setChannelId(app.notifier.notificationGroup) - .setGroup(app.notifier.notificationGroup) - .setLights(-0xff0001, 2000, 2000) - .setPriority(app.notifier.notificationPriority) - .setContentIntent(pendingIntent) - .setStyle(NotificationCompat.BigTextStyle()) - if (!app.notifier.shouldBeQuiet()) { - groupBuilder.setDefaults(app.notifier.notificationDefaults) - } - app.notifier.notificationManager.notify(ID_NOTIFICATIONS, groupBuilder.build()) - } - - app.db.notificationDao().setAllPosted() - - taskCallback.onCompleted() - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/PostNotifications.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/PostNotifications.kt new file mode 100644 index 00000000..6597125a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/PostNotifications.kt @@ -0,0 +1,187 @@ +package pl.szczodrzynski.edziennik.data.api.task + +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.Context +import android.os.Build +import android.util.SparseIntArray +import androidx.core.app.NotificationCompat +import androidx.core.util.forEach +import androidx.core.util.set +import com.mikepenz.iconics.IconicsDrawable +import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial +import com.mikepenz.iconics.utils.* +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.db.entity.Notification.Companion.TYPE_SERVER_MESSAGE +import pl.szczodrzynski.edziennik.utils.models.Time +import pl.szczodrzynski.edziennik.data.db.entity.Notification as AppNotification + +class PostNotifications(val app: App, nList: List) { + companion object { + private const val TAG = "PostNotifications" + } + + private val quiet by lazy { shouldBeQuiet() } + fun shouldBeQuiet(): Boolean { + if (!app.config.sync.quietHoursEnabled) + return false + val now = Time.getNow().value + val start = app.config.sync.quietHoursStart?.value ?: return false + var end = app.config.sync.quietHoursEnd?.value ?: return false + if (start > end) { + // the range spans between two days + end += 240000 + } + return now in start..end || now+240000 in start..end + } + + private fun NotificationCompat.Builder.addDefaults(): NotificationCompat.Builder { + return this.setColor(0xff2196f3.toInt()) + .setLights(0xff2196f3.toInt(), 2000, 2000) + .setPriority(if (quiet) NotificationCompat.PRIORITY_LOW else NotificationCompat.PRIORITY_MAX) + .also { + if (quiet) { + it.setSound(null) + it.setVibrate(longArrayOf()) + } + else + it.setDefaults(NotificationCompat.DEFAULT_ALL) + } + .setGroup(if (quiet) app.notificationChannelsManager.dataQuiet.key else app.notificationChannelsManager.data.key) + } + + private fun buildSummaryText(summaryCounts: SparseIntArray): CharSequence { + val summaryTexts = mutableListOf() + summaryCounts.forEach { key, value -> + if (value <= 0) + return@forEach + val pluralRes = when (key) { + AppNotification.TYPE_TIMETABLE_LESSON_CHANGE -> R.plurals.notification_new_timetable_change_format + AppNotification.TYPE_NEW_GRADE -> R.plurals.notification_new_grades_format + AppNotification.TYPE_NEW_EVENT -> R.plurals.notification_new_events_format + AppNotification.TYPE_NEW_HOMEWORK -> R.plurals.notification_new_homework_format + AppNotification.TYPE_NEW_SHARED_EVENT -> R.plurals.notification_new_shared_events_format + AppNotification.TYPE_NEW_SHARED_HOMEWORK -> R.plurals.notification_new_shared_homework_format + AppNotification.TYPE_NEW_MESSAGE -> R.plurals.notification_new_messages_format + AppNotification.TYPE_NEW_NOTICE -> R.plurals.notification_new_notices_format + AppNotification.TYPE_NEW_ATTENDANCE -> R.plurals.notification_new_attendance_format + AppNotification.TYPE_LUCKY_NUMBER -> R.plurals.notification_new_lucky_number_format + AppNotification.TYPE_NEW_ANNOUNCEMENT -> R.plurals.notification_new_announcements_format + else -> R.plurals.notification_other_format + } + summaryTexts += app.resources.getQuantityString(pluralRes, value, value) + } + return summaryTexts.concat(", ") + } + + init { run { + val count = nList.size + if (count == 0) + return@run + val notificationManager = app.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + val summaryCounts = SparseIntArray() + + val newNotificationsText = app.resources.getQuantityString(R.plurals.notification_count_format, count, count) + val newNotificationsShortText = app.resources.getQuantityString(R.plurals.notification_count_short_format, count, count) + + val intent = Intent( + app, + MainActivity::class.java, + "fragmentId" to MainActivity.DRAWER_ITEM_NOTIFICATIONS + ) + val summaryIntent = PendingIntent.getActivity(app, app.notificationChannelsManager.data.id, intent, PendingIntent.FLAG_ONE_SHOT) + + // On Nougat or newer - show maximum 8 notifications + // On Marshmallow or older - show maximum 4 notifications + + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N && count > 4 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && count > 8) { + val summaryList = mutableListOf() + nList.forEach { + summaryCounts[it.type]++ + summaryList += listOf( + it.profileName.asBoldSpannable(), + it.text + ).concat(": ") + } + + // Create a summary to show *instead* of notifications + val combined = NotificationCompat.Builder(app, app.notificationChannelsManager.data.key) + .setContentTitle(app.getString(R.string.app_name)) + .setContentText(buildSummaryText(summaryCounts)) + .setTicker(newNotificationsText) + .setSmallIcon(R.drawable.ic_notification) + .setLargeIcon(IconicsDrawable(app).apply { + icon = CommunityMaterial.Icon.cmd_bell_ring_outline + colorRes = R.color.colorPrimary + }.toBitmap()) + .setStyle(NotificationCompat.InboxStyle() + .also { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + it.setBigContentTitle(app.getString(R.string.app_name)) + it.setSummaryText(newNotificationsShortText) + } + else { + it.setBigContentTitle(newNotificationsText) + it.setSummaryText(app.getString(R.string.notification_click_to_see_all)) + } + summaryList.forEach { line -> + it.addLine(line) + } + }) + .addDefaults() + .setContentIntent(summaryIntent) + .setAutoCancel(true) + .build() + notificationManager.notify(System.currentTimeMillis().toInt(), combined) + } + else { + // Less than 8 notifications + val notifications = nList.map { + summaryCounts[it.type]++ + NotificationCompat.Builder(app, app.notificationChannelsManager.data.key) + .setContentTitle(it.profileName ?: app.getString(R.string.app_name)) + .setContentText(it.text) + .setSubText(if (it.type == TYPE_SERVER_MESSAGE) null else it.title) + .setTicker("${it.profileName}: ${it.title}") + .setSmallIcon(R.drawable.ic_notification) + .setLargeIcon(IconicsDrawable(app, it.getLargeIcon()).apply { + colorRes = R.color.colorPrimary + }.toBitmap()) + .setStyle(NotificationCompat.BigTextStyle() + .bigText(it.textLong ?: it.text)) + .setWhen(it.addedDate) + .addDefaults() + .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY) + .setContentIntent(it.getPendingIntent(app)) + .setAutoCancel(true) + .build() + } + + val time = System.currentTimeMillis() + notificationManager.apply { + notifications.forEachIndexed { index, it -> + notificationManager.notify((time + index).toInt(), it) + } + } + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + val summary = NotificationCompat.Builder(app, app.notificationChannelsManager.data.key) + .setContentTitle(newNotificationsText) + .setContentText(buildSummaryText(summaryCounts)) + .setTicker(newNotificationsText) + .setSmallIcon(R.drawable.ic_notification) + .setLargeIcon(IconicsDrawable(app).apply { + icon = CommunityMaterial.Icon.cmd_bell_ring_outline + colorRes = R.color.colorPrimary + }.toBitmap()) + .addDefaults() + .setGroupSummary(true) + .setContentIntent(summaryIntent) + .setAutoCancel(true) + .build() + + notificationManager.notify(app.notificationChannelsManager.data.id, summary) + } + } + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/SzkolnyTask.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/SzkolnyTask.kt index a0aca4d0..3ac80495 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/SzkolnyTask.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/task/SzkolnyTask.kt @@ -5,42 +5,72 @@ package pl.szczodrzynski.edziennik.data.api.task import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.HOUR import pl.szczodrzynski.edziennik.R import pl.szczodrzynski.edziennik.data.api.interfaces.EdziennikCallback -import pl.szczodrzynski.edziennik.data.api.szkolny.Szkolny -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi +import pl.szczodrzynski.edziennik.data.db.entity.Notification +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.utils.Utils.d -class SzkolnyTask(val request: Any) : IApiTask(-1) { +class SzkolnyTask(val app: App, val syncingProfiles: List) : IApiTask(-1) { companion object { private const val TAG = "SzkolnyTask" - - fun sync(profiles: List) = SzkolnyTask(SyncRequest(profiles)) - fun shareEvent(event: EventFull) = SzkolnyTask(ShareEventRequest(event)) - fun unshareEvent(event: EventFull) = SzkolnyTask(UnshareEventRequest(event)) } + private val api by lazy { SzkolnyApi(app) } + private val profiles by lazy { app.db.profileDao().allNow } + override fun prepare(app: App) { taskName = app.getString(R.string.edziennik_szkolny_creating_notifications) } + override fun cancel() {} - private lateinit var szkolny: Szkolny + private val notificationList = mutableListOf() - override fun prepare(app: App) { - taskName = app.getString(R.string.edziennik_szkolny_api_sync_title) - } + internal fun run(taskCallback: EdziennikCallback) { + val startTime = System.currentTimeMillis() - override fun cancel() { - // TODO - } + // create all e-register data notifications + val notifications = Notifications(app, notificationList, profiles) + notifications.run() - internal fun run(app: App, taskCallback: EdziennikCallback) { - szkolny = Szkolny(app, taskCallback) + val appSyncProfiles = profiles.filter { it.registration == Profile.REGISTRATION_ENABLED && !it.archived } + // App Sync conditions: + // - every 24 hours && any profile is registered + // - if there are new notifications && any browser is paired + val shouldAppSync = + System.currentTimeMillis() - app.config.sync.lastAppSync > 24*HOUR*1000 + && appSyncProfiles.isNotEmpty() + || notificationList.isNotEmpty() + && app.config.sync.webPushEnabled - when (request) { - is SyncRequest -> szkolny.sync(request.profiles) - is ShareEventRequest -> szkolny.shareEvent(request.event) - is UnshareEventRequest -> szkolny.unshareEvent(request.event) + if (shouldAppSync) { + // send notifications to web push, get shared events + val addedEvents = AppSync(app, notificationList, appSyncProfiles, api).run(app.config.sync.lastAppSync) + if (addedEvents > 0) { + // create notifications for shared events (not present before app sync) + notifications.sharedEventNotifications() + } } - } + d(TAG, "Created ${notificationList.count()} notifications.") - data class SyncRequest(val profiles: List) - data class ShareEventRequest(val event: EventFull) - data class UnshareEventRequest(val event: EventFull) + // filter notifications + notificationList + .mapNotNull { it.profileId } + .distinct() + .map { app.config.getFor(it).sync.notificationFilter } + .forEach { filter -> + filter.forEach { type -> + notificationList.removeAll { it.type == type } + } + } + + // update the database + app.db.metadataDao().setAllNotified(true) + if (notificationList.isNotEmpty()) + app.db.notificationDao().addAll(notificationList) + app.db.profileDao().setAllNotEmpty() + + // post all notifications + PostNotifications(app, notificationList) + d(TAG, "SzkolnyTask: finished in ${System.currentTimeMillis()-startTime} ms.") + taskCallback.onCompleted() + } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.java deleted file mode 100644 index 7144ccb3..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.java +++ /dev/null @@ -1,908 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db; - -import android.content.Context; - -import androidx.annotation.NonNull; -import androidx.room.Database; -import androidx.room.Room; -import androidx.room.RoomDatabase; -import androidx.room.TypeConverters; -import androidx.room.migration.Migration; -import androidx.sqlite.db.SupportSQLiteDatabase; - -import pl.szczodrzynski.edziennik.config.db.ConfigDao; -import pl.szczodrzynski.edziennik.config.db.ConfigEntry; -import pl.szczodrzynski.edziennik.data.db.converters.ConverterDate; -import pl.szczodrzynski.edziennik.data.db.converters.ConverterDateInt; -import pl.szczodrzynski.edziennik.data.db.converters.ConverterJsonObject; -import pl.szczodrzynski.edziennik.data.db.converters.ConverterListLong; -import pl.szczodrzynski.edziennik.data.db.converters.ConverterListString; -import pl.szczodrzynski.edziennik.data.db.converters.ConverterTime; -import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement; -import pl.szczodrzynski.edziennik.data.db.modules.announcements.AnnouncementDao; -import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimer; -import pl.szczodrzynski.edziennik.data.db.modules.api.EndpointTimerDao; -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance; -import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceDao; -import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceType; -import pl.szczodrzynski.edziennik.data.db.modules.attendance.AttendanceTypeDao; -import pl.szczodrzynski.edziennik.data.db.modules.classrooms.Classroom; -import pl.szczodrzynski.edziennik.data.db.modules.classrooms.ClassroomDao; -import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLog; -import pl.szczodrzynski.edziennik.data.db.modules.debuglog.DebugLogDao; -import pl.szczodrzynski.edziennik.data.db.modules.events.Event; -import pl.szczodrzynski.edziennik.data.db.modules.events.EventDao; -import pl.szczodrzynski.edziennik.data.db.modules.events.EventType; -import pl.szczodrzynski.edziennik.data.db.modules.events.EventTypeDao; -import pl.szczodrzynski.edziennik.data.db.modules.feedback.FeedbackMessage; -import pl.szczodrzynski.edziennik.data.db.modules.feedback.FeedbackMessageDao; -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade; -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategory; -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeCategoryDao; -import pl.szczodrzynski.edziennik.data.db.modules.grades.GradeDao; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.Lesson; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChangeDao; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonDao; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRange; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonRangeDao; -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore; -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStoreDao; -import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumber; -import pl.szczodrzynski.edziennik.data.db.modules.luckynumber.LuckyNumberDao; -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message; -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageDao; -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipient; -import pl.szczodrzynski.edziennik.data.db.modules.messages.MessageRecipientDao; -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata; -import pl.szczodrzynski.edziennik.data.db.modules.metadata.MetadataDao; -import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice; -import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeDao; -import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeType; -import pl.szczodrzynski.edziennik.data.db.modules.notices.NoticeTypeDao; -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification; -import pl.szczodrzynski.edziennik.data.db.modules.notification.NotificationDao; -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile; -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileDao; -import pl.szczodrzynski.edziennik.data.db.modules.subjects.Subject; -import pl.szczodrzynski.edziennik.data.db.modules.subjects.SubjectDao; -import pl.szczodrzynski.edziennik.data.db.modules.teachers.Teacher; -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsence; -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceDao; -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceType; -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherAbsenceTypeDao; -import pl.szczodrzynski.edziennik.data.db.modules.teachers.TeacherDao; -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team; -import pl.szczodrzynski.edziennik.data.db.modules.teams.TeamDao; -import pl.szczodrzynski.edziennik.data.db.modules.timetable.TimetableDao; -import pl.szczodrzynski.edziennik.utils.models.Date; - -@Database(entities = { - Grade.class, - //GradeCategory.class, - Teacher.class, - TeacherAbsence.class, - TeacherAbsenceType.class, - Subject.class, - Notice.class, - Lesson.class, - LessonChange.class, - Team.class, - Attendance.class, - Event.class, - EventType.class, - LoginStore.class, - Profile.class, - LuckyNumber.class, - Announcement.class, - GradeCategory.class, - FeedbackMessage.class, - Message.class, - MessageRecipient.class, - DebugLog.class, - EndpointTimer.class, - LessonRange.class, - Notification.class, - Classroom.class, - NoticeType.class, - AttendanceType.class, - pl.szczodrzynski.edziennik.data.db.modules.timetable.Lesson.class, - ConfigEntry.class, - Metadata.class}, version = 69) -@TypeConverters({ - ConverterTime.class, - ConverterDate.class, - ConverterJsonObject.class, - ConverterListLong.class, - ConverterListString.class, - ConverterDateInt.class}) -public abstract class AppDb extends RoomDatabase { - - public abstract GradeDao gradeDao(); - //public abstract GradeCategoryDao gradeCategoryDao(); - public abstract TeacherDao teacherDao(); - public abstract TeacherAbsenceDao teacherAbsenceDao(); - public abstract TeacherAbsenceTypeDao teacherAbsenceTypeDao(); - public abstract SubjectDao subjectDao(); - public abstract NoticeDao noticeDao(); - public abstract LessonDao lessonDao(); - public abstract LessonChangeDao lessonChangeDao(); - public abstract TeamDao teamDao(); - public abstract AttendanceDao attendanceDao(); - public abstract EventDao eventDao(); - public abstract EventTypeDao eventTypeDao(); - public abstract LoginStoreDao loginStoreDao(); - public abstract ProfileDao profileDao(); - public abstract LuckyNumberDao luckyNumberDao(); - public abstract AnnouncementDao announcementDao(); - public abstract GradeCategoryDao gradeCategoryDao(); - public abstract FeedbackMessageDao feedbackMessageDao(); - public abstract MessageDao messageDao(); - public abstract MessageRecipientDao messageRecipientDao(); - public abstract DebugLogDao debugLogDao(); - public abstract EndpointTimerDao endpointTimerDao(); - public abstract LessonRangeDao lessonRangeDao(); - public abstract NotificationDao notificationDao(); - public abstract ClassroomDao classroomDao(); - public abstract NoticeTypeDao noticeTypeDao(); - public abstract AttendanceTypeDao attendanceTypeDao(); - public abstract TimetableDao timetableDao(); - public abstract ConfigDao configDao(); - public abstract MetadataDao metadataDao(); - - private static volatile AppDb INSTANCE; - - private static final Migration MIGRATION_11_12 = new Migration(11, 12) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("PRAGMA foreign_keys=off;"); - database.execSQL("ALTER TABLE teams RENAME TO _teams_old;"); - database.execSQL("CREATE TABLE teams (profileId INTEGER NOT NULL, teamId INTEGER NOT NULL, teamType INTEGER NOT NULL, teamName TEXT, teamTeacherId INTEGER NOT NULL, PRIMARY KEY(profileId, teamId));"); - database.execSQL("INSERT INTO teams (profileId, teamId, teamType, teamName, teamTeacherId) SELECT profileId, teamId, teamType, teamName, teacherId FROM _teams_old;"); - database.execSQL("DROP TABLE _teams_old;"); - database.execSQL("PRAGMA foreign_keys=on;"); - } - }; - private static final Migration MIGRATION_12_13 = new Migration(12, 13) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE lessonChanges ADD lessonChangeWeekDay INTEGER NOT NULL DEFAULT -1;"); - } - }; - private static final Migration MIGRATION_13_14 = new Migration(13, 14) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE loginStores (loginStoreId INTEGER NOT NULL, loginStoreType INTEGER NOT NULL, loginStoreData TEXT, PRIMARY KEY(loginStoreId));"); - } - }; - private static final Migration MIGRATION_14_15 = new Migration(14, 15) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE grades RENAME TO _grades_old;"); - database.execSQL("CREATE TABLE `grades` (\n" + - "\t`profileId`\tINTEGER NOT NULL,\n" + - "\t`gradeId`\tINTEGER NOT NULL,\n" + - "\t`gradeDescription`\tTEXT,\n" + - "\t`gradeName`\tTEXT,\n" + - "\t`gradeValue`\tREAL NOT NULL,\n" + - "\t`gradeWeight`\tREAL NOT NULL,\n" + - "\t`gradeSemester`\tINTEGER NOT NULL,\n" + - "\t`gradeType`\tINTEGER NOT NULL,\n" + - "\t`teacherId`\tINTEGER NOT NULL,\n" + - "\t`categoryId`\tINTEGER NOT NULL,\n" + - "\t`subjectId`\tINTEGER NOT NULL,\n" + - "\tPRIMARY KEY(`profileId`,`gradeId`)\n" + - ");"); - database.execSQL("INSERT INTO grades\n" + - " SELECT *\n" + - " FROM _grades_old;"); - database.execSQL("DROP TABLE _grades_old;"); - database.execSQL("CREATE INDEX index_grades_profileId ON grades (profileId);"); - } - }; - private static final Migration MIGRATION_15_16 = new Migration(15, 16) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE profiles (" + - "profileId INTEGER NOT NULL, " + - "name TEXT, " + - "subname TEXT, " + - "image TEXT, " + - "syncEnabled INTEGER NOT NULL, " + - "syncNotifications INTEGER NOT NULL, " + - "enableSharedEvents INTEGER NOT NULL, " + - "countInSeconds INTEGER NOT NULL, " + - "loggedIn INTEGER NOT NULL, " + - "empty INTEGER NOT NULL, " + - "studentNameLong TEXT, " + - "studentNameShort TEXT, " + - "studentNumber INTEGER NOT NULL, " + - "studentData TEXT, " + - "registration INTEGER NOT NULL, " + - "gradeColorMode INTEGER NOT NULL, " + - "agendaViewType INTEGER NOT NULL, " + - "currentSemester INTEGER NOT NULL, " + - "attendancePercentage REAL NOT NULL, " + - "dateSemester1Start TEXT, " + - "dateSemester2Start TEXT, " + - "dateYearEnd TEXT, " + - "luckyNumberEnabled INTEGER NOT NULL, " + - "luckyNumber INTEGER NOT NULL, " + - "luckyNumberDate TEXT, " + - "loginStoreId INTEGER NOT NULL, " + - "PRIMARY KEY(profileId));"); - } - }; - private static final Migration MIGRATION_16_17 = new Migration(16, 17) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE profiles ADD archived INTEGER NOT NULL DEFAULT 0;"); - database.execSQL("ALTER TABLE teams ADD teamCode TEXT;"); - } - }; - private static final Migration MIGRATION_17_18 = new Migration(17, 18) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE events ADD eventBlacklisted INTEGER NOT NULL DEFAULT 0;"); - } - }; - private static final Migration MIGRATION_18_19 = new Migration(18, 19) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE grades ADD gradeClassAverage REAL NOT NULL DEFAULT -1;"); - } - }; - private static final Migration MIGRATION_19_20 = new Migration(19, 20) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE luckyNumbers (" + - "profileId INTEGER NOT NULL, " + - "luckyNumberDate TEXT NOT NULL, " + - "luckyNumber INTEGER NOT NULL, " + - "PRIMARY KEY(profileId, luckyNumberDate));"); - } - }; - private static final Migration MIGRATION_20_21 = new Migration(20, 21) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE grades ADD gradeCategory TEXT"); - database.execSQL("ALTER TABLE grades ADD gradeColor INTEGER NOT NULL DEFAULT -1"); - database.execSQL("DROP TABLE gradeCategories"); - } - }; - private static final Migration MIGRATION_21_22 = new Migration(21, 22) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE eventTypes (" + - "profileId INTEGER NOT NULL, " + - "eventType INTEGER NOT NULL, " + - "eventTypeName TEXT, " + - "eventTypeColor INTEGER NOT NULL, " + - "PRIMARY KEY(profileId, eventType));"); - } - }; - private static final Migration MIGRATION_22_23 = new Migration(22, 23) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE grades RENAME TO _grades_old;"); - database.execSQL("CREATE TABLE `grades` (\n" + - "\t`profileId`\tINTEGER NOT NULL,\n" + - "\t`gradeId`\tINTEGER NOT NULL,\n" + - "\t`gradeCategory`\tTEXT,\n" + - "\t`gradeColor`\tINTEGER NOT NULL DEFAULT -1,\n" + - "\t`gradeDescription`\tTEXT,\n" + - "\t`gradeName`\tTEXT,\n" + - "\t`gradeValue`\tREAL NOT NULL,\n" + - "\t`gradeWeight`\tREAL NOT NULL,\n" + - "\t`gradeSemester`\tINTEGER NOT NULL,\n" + - "\t`gradeClassAverage`\tREAL NOT NULL DEFAULT -1,\n" + - "\t`gradeType`\tINTEGER NOT NULL,\n" + - "\t`teacherId`\tINTEGER NOT NULL,\n" + - "\t`subjectId`\tINTEGER NOT NULL,\n" + - "\tPRIMARY KEY(`profileId`,`gradeId`)\n" + - ");"); - database.execSQL("DROP INDEX index_grades_profileId"); - database.execSQL("CREATE INDEX `index_grades_profileId` ON `grades` (\n" + - "\t`profileId`\n" + - ");"); - database.execSQL("INSERT INTO grades (profileId, gradeId, gradeDescription, gradeName, gradeValue, gradeWeight, gradeSemester, gradeType, teacherId, subjectId, gradeClassAverage, gradeCategory, gradeColor) SELECT profileId, gradeId, gradeDescription, gradeName, gradeValue, gradeWeight, gradeSemester, gradeType, teacherId, subjectId, gradeClassAverage, gradeCategory, gradeColor FROM _grades_old;"); - database.execSQL("DROP TABLE _grades_old;"); - - database.execSQL("ALTER TABLE attendances RENAME TO _attendances_old;"); - database.execSQL("CREATE TABLE `attendances` (\n" + - "\t`profileId`\tINTEGER NOT NULL,\n" + - "\t`attendanceId`\tINTEGER NOT NULL,\n" + - "\t`attendanceLessonDate`\tTEXT NOT NULL,\n" + - "\t`attendanceStartTime`\tTEXT NOT NULL,\n" + - "\t`attendanceLessonTopic`\tTEXT,\n" + - "\t`attendanceSemester`\tINTEGER NOT NULL,\n" + - "\t`attendanceType`\tINTEGER NOT NULL,\n" + - "\t`teacherId`\tINTEGER NOT NULL,\n" + - "\t`subjectId`\tINTEGER NOT NULL,\n" + - "\tPRIMARY KEY(`profileId`,`attendanceId`,`attendanceLessonDate`,`attendanceStartTime`)\n" + - ");"); - database.execSQL("DROP INDEX index_attendances_profileId"); - database.execSQL("CREATE INDEX `index_attendances_profileId` ON `attendances` (\n" + - "\t`profileId`\n" + - ");"); - database.execSQL("INSERT INTO attendances SELECT * FROM _attendances_old;"); - database.execSQL("DROP TABLE _attendances_old;"); - } - }; - private static final Migration MIGRATION_23_24 = new Migration(23, 24) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE profiles ADD yearAverageMode INTEGER NOT NULL DEFAULT 0"); - } - }; - private static final Migration MIGRATION_24_25 = new Migration(24, 25) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE announcements (" + - "profileId INTEGER NOT NULL, " + - "announcementId INTEGER NOT NULL, " + - "announcementSubject TEXT, " + - "announcementText TEXT, " + - "announcementStartDate TEXT, " + - "announcementEndDate TEXT, " + - "teacherId INTEGER NOT NULL, " + - "PRIMARY KEY(profileId, announcementId));"); - //database.execSQL("DROP INDEX index_announcements_profileId"); - database.execSQL("CREATE INDEX index_announcements_profileId ON announcements (" + - "profileId" + - ");"); - } - }; - private static final Migration MIGRATION_25_26 = new Migration(25, 26) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE grades ADD gradePointGrade INTEGER NOT NULL DEFAULT 0;"); - } - }; - private static final Migration MIGRATION_26_27 = new Migration(26, 27) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE grades ADD gradeValueMax REAL NOT NULL DEFAULT 0;"); - } - }; - private static final Migration MIGRATION_27_28 = new Migration(27, 28) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE gradeCategories (profileId INTEGER NOT NULL, categoryId INTEGER NOT NULL, weight REAL NOT NULL, color INTEGER NOT NULL, `text` TEXT, columns TEXT, valueFrom REAL NOT NULL, valueTo REAL NOT NULL, PRIMARY KEY(profileId, categoryId));"); - database.execSQL("ALTER TABLE grades ADD gradeComment TEXT;"); - } - }; - private static final Migration MIGRATION_28_29 = new Migration(28, 29) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE feedbackMessages (messageId INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, received INTEGER NOT NULL DEFAULT 0, sentTime INTEGER NOT NULL, `text` TEXT)"); - } - }; - private static final Migration MIGRATION_29_30 = new Migration(29, 30) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE feedbackMessages ADD fromUser TEXT DEFAULT NULL"); - database.execSQL("ALTER TABLE feedbackMessages ADD fromUserName TEXT DEFAULT NULL"); - } - }; - private static final Migration MIGRATION_30_31 = new Migration(30, 31) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE messages (" + - "profileId INTEGER NOT NULL, " + - "messageId INTEGER NOT NULL, " + - "messageSubject TEXT, " + - "messageBody TEXT DEFAULT NULL, " + - "messageType INTEGER NOT NULL DEFAULT 0, " + - "senderId INTEGER NOT NULL DEFAULT -1, " + - "senderReplyId INTEGER NOT NULL DEFAULT -1, " + - "recipientIds TEXT DEFAULT NULL, " + - "recipientReplyIds TEXT DEFAULT NULL, " + - "readByRecipientDates TEXT DEFAULT NULL, " + - "overrideHasAttachments INTEGER NOT NULL DEFAULT 0, " + - "attachmentIds TEXT DEFAULT NULL, " + - "attachmentNames TEXT DEFAULT NULL, " + - "PRIMARY KEY(profileId, messageId));"); - //database.execSQL("DROP INDEX index_announcements_profileId"); - database.execSQL("CREATE INDEX index_messages_profileId ON messages (" + - "profileId" + - ");"); - } - }; - private static final Migration MIGRATION_31_32 = new Migration(31, 32) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE messages ADD attachmentSizes TEXT DEFAULT NULL"); - } - }; - private static final Migration MIGRATION_32_33 = new Migration(32, 33) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("DROP TABLE messages"); - database.execSQL("CREATE TABLE messages (" + - "profileId INTEGER NOT NULL, " + - "messageId INTEGER NOT NULL, " + - "messageSubject TEXT, " + - "messageBody TEXT DEFAULT NULL, " + - "messageType INTEGER NOT NULL DEFAULT 0, " + - "senderId INTEGER NOT NULL DEFAULT -1, " + - "senderReplyId INTEGER NOT NULL DEFAULT -1, " + - "overrideHasAttachments INTEGER NOT NULL DEFAULT 0, " + - "attachmentIds TEXT DEFAULT NULL, " + - "attachmentNames TEXT DEFAULT NULL, " + - "attachmentSizes TEXT DEFAULT NULL, " + - "PRIMARY KEY(profileId, messageId));"); - //database.execSQL("DROP INDEX index_announcements_profileId"); - database.execSQL("CREATE INDEX index_messages_profileId ON messages (" + - "profileId" + - ");"); - database.execSQL("CREATE TABLE messageRecipients (" + - "profileId INTEGER NOT NULL, " + - "messageRecipientId INTEGER NOT NULL DEFAULT -1, " + - "messageRecipientReplyId INTEGER NOT NULL DEFAULT -1, " + - "messageRecipientReadDate INTEGER NOT NULL DEFAULT -1, " + - "messageId INTEGER NOT NULL, " + - "PRIMARY KEY(profileId, messageRecipientId));"); - } - }; - private static final Migration MIGRATION_33_34 = new Migration(33, 34) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("DROP TABLE messageRecipients"); - database.execSQL("CREATE TABLE messageRecipients (" + - "profileId INTEGER NOT NULL, " + - "messageRecipientId INTEGER NOT NULL DEFAULT -1, " + - "messageRecipientReplyId INTEGER NOT NULL DEFAULT -1, " + - "messageRecipientReadDate INTEGER NOT NULL DEFAULT -1, " + - "messageId INTEGER NOT NULL, " + - "PRIMARY KEY(profileId, messageRecipientId, messageId));"); - } - }; - private static final Migration MIGRATION_34_35 = new Migration(34, 35) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE teachers ADD teacherLoginId TEXT DEFAULT NULL;"); - } - }; - private static final Migration MIGRATION_35_36 = new Migration(35, 36) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("UPDATE profiles SET yearAverageMode = 4 WHERE yearAverageMode = 0"); - } - }; - private static final Migration MIGRATION_36_37 = new Migration(36, 37) { - @Override - public void migrate(SupportSQLiteDatabase database) { - } - }; - private static final Migration MIGRATION_37_38 = new Migration(37, 38) { - @Override - public void migrate(SupportSQLiteDatabase database) { - Date today = Date.getToday(); - int schoolYearStart = today.month < 9 ? today.year-1 : today.year; - database.execSQL("UPDATE profiles SET dateSemester1Start = '"+schoolYearStart+"-09-01' WHERE dateSemester1Start IS NULL;"); - database.execSQL("UPDATE profiles SET dateSemester2Start = '"+(schoolYearStart+1)+"-02-01' WHERE dateSemester2Start IS NULL;"); - database.execSQL("UPDATE profiles SET dateYearEnd = '"+(schoolYearStart+1)+"-06-30' WHERE dateYearEnd IS NULL;"); - } - }; - private static final Migration MIGRATION_38_39 = new Migration(38, 39) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE debugLogs (id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, `text` TEXT);"); - } - }; - private static final Migration MIGRATION_39_40 = new Migration(39, 40) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE profiles ADD changedEndpoints TEXT DEFAULT NULL;"); - } - }; - private static final Migration MIGRATION_40_41 = new Migration(40, 41) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("UPDATE profiles SET empty = 1;"); - } - }; - private static final Migration MIGRATION_41_42 = new Migration(41, 42) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("UPDATE profiles SET empty = 1;"); - } - }; - private static final Migration MIGRATION_42_43 = new Migration(42, 43) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE profiles ADD lastFullSync INTEGER NOT NULL DEFAULT 0;"); - } - }; - private static final Migration MIGRATION_43_44 = new Migration(43, 44) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("UPDATE profiles SET empty = 1;"); - database.execSQL("UPDATE profiles SET currentSemester = 1;"); - } - }; - private static final Migration MIGRATION_44_45 = new Migration(44, 45) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("UPDATE profiles SET empty = 1;"); - } - }; - private static final Migration MIGRATION_45_46 = new Migration(45, 46) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("UPDATE profiles SET lastFullSync = 0"); - } - }; - private static final Migration MIGRATION_46_47 = new Migration(46, 47) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("UPDATE profiles SET lastFullSync = 0"); - } - }; - private static final Migration MIGRATION_47_48 = new Migration(47, 48) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE notices ADD points REAL NOT NULL DEFAULT 0"); - database.execSQL("ALTER TABLE notices ADD category TEXT DEFAULT NULL"); - } - }; - private static final Migration MIGRATION_48_49 = new Migration(48, 49) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE grades ADD gradeParentId INTEGER NOT NULL DEFAULT -1"); - } - }; - private static final Migration MIGRATION_49_50 = new Migration(49, 50) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE grades ADD gradeIsImprovement INTEGER NOT NULL DEFAULT 0"); - database.execSQL("DELETE FROM attendances WHERE attendances.profileId IN (SELECT profiles.profileId FROM profiles JOIN loginStores USING(loginStoreId) WHERE loginStores.loginStoreType = 1)"); - database.execSQL("UPDATE profiles SET empty = 1 WHERE profileId IN (SELECT profiles.profileId FROM profiles JOIN loginStores USING(loginStoreId) WHERE loginStores.loginStoreType = 4)"); - } - }; - private static final Migration MIGRATION_50_51 = new Migration(50, 51) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE profiles ADD lastReceiversSync INTEGER NOT NULL DEFAULT 0"); - database.execSQL("ALTER TABLE teachers ADD teacherType INTEGER NOT NULL DEFAULT 0"); - } - }; - private static final Migration MIGRATION_51_52 = new Migration(51, 52) { - @Override - public void migrate(SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE teachers ADD teacherTypeDescription TEXT DEFAULT NULL"); - } - }; - private static final Migration MIGRATION_52_53 = new Migration(52, 53) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE IF NOT EXISTS teacherAbsence (" + - "profileId INTEGER NOT NULL," + - "teacherAbsenceId INTEGER NOT NULL," + - "teacherId INTEGER NOT NULL," + - "teacherAbsenceType INTEGER NOT NULL," + - "teacherAbsenceDateFrom TEXT NOT NULL," + - "teacherAbsenceDateTo TEXT NOT NULL," + - "PRIMARY KEY(profileId, teacherAbsenceId)" + - ")"); - } - }; - private static final Migration MIGRATION_53_54 = new Migration(53, 54) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE teacherAbsence ADD teacherAbsenceTimeFrom TEXT DEFAULT NULL"); - database.execSQL("ALTER TABLE teacherAbsence ADD teacherAbsenceTimeTo TEXT DEFAULT NULL"); - } - }; - private static final Migration MIGRATION_54_55 = new Migration(54, 55) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - // 2019-10-21 for merge compatibility between 3.1.1 and api-v2 - // moved to Migration 55->56 - } - }; - private static final Migration MIGRATION_55_56 = new Migration(55, 56) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE IF NOT EXISTS endpointTimers (" + - "profileId INTEGER NOT NULL," + - "endpointId INTEGER NOT NULL," + - "endpointLastSync INTEGER DEFAULT NULL," + - "endpointNextSync INTEGER NOT NULL DEFAULT 1," + - "endpointViewId INTEGER DEFAULT NULL," + - "PRIMARY KEY(profileId, endpointId)" + - ")"); - database.execSQL("CREATE TABLE IF NOT EXISTS lessonRanges (" + - "profileId INTEGER NOT NULL," + - "lessonRangeNumber INTEGER NOT NULL," + - "lessonRangeStart TEXT NOT NULL," + - "lessonRangeEnd TEXT NOT NULL," + - "PRIMARY KEY(profileId, lessonRangeNumber)" + - ")"); - } - }; - private static final Migration MIGRATION_56_57 = new Migration(56, 57) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE gradeCategories ADD type INTEGER NOT NULL DEFAULT 0"); - } - }; - private static final Migration MIGRATION_57_58 = new Migration(57, 58) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE metadata RENAME TO _metadata_old;"); - database.execSQL("DROP INDEX index_metadata_profileId_thingType_thingId;"); - database.execSQL("UPDATE _metadata_old SET thingType = "+Metadata.TYPE_HOMEWORK+" WHERE thingType = "+Metadata.TYPE_EVENT+" AND thingId IN (SELECT eventId FROM events WHERE eventType = -1);"); - database.execSQL("CREATE TABLE metadata (\n"+ - "profileId INTEGER NOT NULL,\n"+ - "metadataId INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n"+ - "thingType INTEGER NOT NULL,\n"+ - "thingId INTEGER NOT NULL,\n"+ - "seen INTEGER NOT NULL,\n"+ - "notified INTEGER NOT NULL,\n"+ - "addedDate INTEGER NOT NULL);"); - database.execSQL("INSERT INTO metadata SELECT * FROM (SELECT * FROM _metadata_old ORDER BY addedDate DESC) GROUP BY thingId;"); - database.execSQL("DROP TABLE _metadata_old;"); - database.execSQL("CREATE UNIQUE INDEX index_metadata_profileId_thingType_thingId ON metadata (profileId, thingType, thingId);"); - } - }; - private static final Migration MIGRATION_58_59 = new Migration(58, 59) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("UPDATE metadata SET addedDate = addedDate*1000 WHERE addedDate < 10000000000;"); - database.execSQL("INSERT INTO metadata (profileId, thingType, thingId, seen, notified, addedDate)\n" + - "SELECT profileId,\n" + - "10 AS thingType,\n" + - "luckyNumberDate*10000+substr(luckyNumberDate, 6)*100+substr(luckyNumberDate, 9) AS thingId,\n" + - "1 AS seen,\n" + - "1 AS notified,\n" + - "CAST(strftime('%s', luckyNumberDate) AS INT)*1000 AS addedDate\n" + - "FROM luckyNumbers;"); - database.execSQL("ALTER TABLE luckyNumbers RENAME TO _old_luckyNumbers;"); - database.execSQL("CREATE TABLE luckyNumbers (\n" + - "profileId INTEGER NOT NULL,\n" + - "luckyNumberDate INTEGER NOT NULL, \n" + - "luckyNumber INTEGER NOT NULL, \n" + - "PRIMARY KEY(profileId, luckyNumberDate))"); - database.execSQL("INSERT INTO luckyNumbers (profileId, luckyNumberDate, luckyNumber)\n" + - "SELECT profileId,\n" + - "luckyNumberDate*10000+substr(luckyNumberDate, 6)*100+substr(luckyNumberDate, 9) AS luckyNumberDate,\n" + - "luckyNumber\n" + - "FROM _old_luckyNumbers;"); - database.execSQL("DROP TABLE _old_luckyNumbers;"); - } - }; - private static final Migration MIGRATION_59_60 = new Migration(59, 60) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE notifications (\n" + - " id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\n" + - " title TEXT NOT NULL,\n" + - " `text` TEXT NOT NULL,\n" + - " `type` INTEGER NOT NULL,\n" + - " profileId INTEGER DEFAULT NULL,\n" + - " profileName TEXT DEFAULT NULL,\n" + - " posted INTEGER NOT NULL DEFAULT 0,\n" + - " viewId INTEGER DEFAULT NULL,\n" + - " extras TEXT DEFAULT NULL,\n" + - " addedDate INTEGER NOT NULL\n" + - ");"); - - database.execSQL("ALTER TABLE profiles ADD COLUMN disabledNotifications TEXT DEFAULT NULL"); - } - }; - private static final Migration MIGRATION_60_61 = new Migration(60, 61) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE IF NOT EXISTS teacherAbsenceTypes (" + - "profileId INTEGER NOT NULL," + - "teacherAbsenceTypeId INTEGER NOT NULL," + - "teacherAbsenceTypeName TEXT NOT NULL," + - "PRIMARY KEY(profileId, teacherAbsenceTypeId))"); - database.execSQL("ALTER TABLE teacherAbsence ADD COLUMN teacherAbsenceName TEXT DEFAULT NULL"); - } - }; - private static final Migration MIGRATION_61_62 = new Migration(61, 62) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE IF NOT EXISTS classrooms (\n" + - " profileId INTEGER NOT NULL,\n" + - " id INTEGER NOT NULL,\n" + - " name TEXT NOT NULL,\n" + - " PRIMARY KEY(profileId, id)\n" + - ")"); - database.execSQL("CREATE TABLE IF NOT EXISTS noticeTypes (\n" + - " profileId INTEGER NOT NULL,\n" + - " id INTEGER NOT NULL,\n" + - " name TEXT NOT NULL,\n" + - " PRIMARY KEY(profileId, id)\n" + - ")"); - database.execSQL("CREATE TABLE IF NOT EXISTS attendanceTypes (\n" + - " profileId INTEGER NOT NULL,\n" + - " id INTEGER NOT NULL,\n" + - " name TEXT NOT NULL,\n" + - " type INTEGER NOT NULL,\n" + - " color INTEGER NOT NULL,\n" + - " PRIMARY KEY(profileId, id)\n" + - ")"); - } - }; - private static final Migration MIGRATION_62_63 = new Migration(62, 63) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE profiles ADD COLUMN accountNameLong TEXT DEFAULT NULL"); - database.execSQL("ALTER TABLE profiles ADD COLUMN studentClassName TEXT DEFAULT NULL"); - database.execSQL("ALTER TABLE profiles ADD COLUMN studentSchoolYear TEXT DEFAULT NULL"); - } - }; - private static final Migration MIGRATION_63_64 = new Migration(63, 64) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - //database.execSQL("ALTER TABLE lessons RENAME TO lessonsOld;"); - database.execSQL("CREATE TABLE timetable (" + - "profileId INTEGER NOT NULL," + - "id INTEGER NOT NULL," + - "type INTEGER NOT NULL," + - - "date TEXT DEFAULT NULL," + - "lessonNumber INTEGER DEFAULT NULL," + - "startTime TEXT DEFAULT NULL," + - "endTime TEXT DEFAULT NULL," + - "subjectId INTEGER DEFAULT NULL," + - "teacherId INTEGER DEFAULT NULL," + - "teamId INTEGER DEFAULT NULL," + - "classroom TEXT DEFAULT NULL," + - - "oldDate TEXT DEFAULT NULL," + - "oldLessonNumber INTEGER DEFAULT NULL," + - "oldStartTime TEXT DEFAULT NULL," + - "oldEndTime TEXT DEFAULT NULL," + - "oldSubjectId INTEGER DEFAULT NULL," + - "oldTeacherId INTEGER DEFAULT NULL," + - "oldTeamId INTEGER DEFAULT NULL," + - "oldClassroom TEXT DEFAULT NULL," + - "PRIMARY KEY(id));"); - database.execSQL("CREATE INDEX index_lessons_profileId_type_date ON timetable (profileId, type, date);"); - database.execSQL("CREATE INDEX index_lessons_profileId_type_oldDate ON timetable (profileId, type, oldDate);"); - } - }; - private static final Migration MIGRATION_64_65 = new Migration(64, 65) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("CREATE TABLE config (" + - "profileId INTEGER NOT NULL DEFAULT -1," + - "`key` TEXT NOT NULL," + - "value TEXT NOT NULL," + - "PRIMARY KEY(profileId, `key`));"); - } - }; - private static final Migration MIGRATION_65_66 = new Migration(65, 66) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("DROP TABLE config;"); - database.execSQL("CREATE TABLE config (" + - "profileId INTEGER NOT NULL DEFAULT -1," + - "`key` TEXT NOT NULL," + - "value TEXT," + - "PRIMARY KEY(profileId, `key`));"); - } - }; - private static final Migration MIGRATION_66_67 = new Migration(66, 67) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("DELETE FROM grades WHERE (gradeId=-1 OR gradeId=-2) AND gradeType=20"); - database.execSQL("DELETE FROM metadata WHERE (thingId=-1 OR thingId=-2) AND thingType=1"); - - database.execSQL("ALTER TABLE gradeCategories RENAME TO _gradeCategories"); - database.execSQL("CREATE TABLE gradeCategories (" + - "profileId INTEGER NOT NULL," + - "categoryId INTEGER NOT NULL," + - "weight REAL NOT NULL," + - "color INTEGER NOT NULL," + - "`text` TEXT," + - "columns TEXT," + - "valueFrom REAL NOT NULL," + - "valueTo REAL NOT NULL," + - "type INTEGER NOT NULL," + - "PRIMARY KEY(profileId, categoryId, type))"); - - database.execSQL("INSERT INTO gradeCategories (profileId, categoryId, weight, color," + - "`text`, columns, valueFrom, valueTo, type) " + - "SELECT profileId, categoryId, weight, color, `text`, columns, valueFrom," + - "valueTo, type FROM _gradeCategories"); - - database.execSQL("DROP TABLE _gradeCategories"); - } - }; - private static final Migration MIGRATION_67_68 = new Migration(67, 68) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - /* Migration from crc16 to crc32 id */ - database.execSQL("DELETE FROM announcements"); - database.execSQL("DELETE FROM metadata WHERE thingType=7"); - } - }; - private static final Migration MIGRATION_68_69 = new Migration(68, 69) { - @Override - public void migrate(@NonNull SupportSQLiteDatabase database) { - database.execSQL("ALTER TABLE loginStores ADD COLUMN loginStoreMode INTEGER NOT NULL DEFAULT 0"); - } - }; - - - public static AppDb getDatabase(final Context context) { - if (INSTANCE == null) { - synchronized (AppDb.class) { - if (INSTANCE == null) { - INSTANCE = Room.databaseBuilder(context.getApplicationContext(), - AppDb.class, "edziennik.db") - .addMigrations( - MIGRATION_11_12, - MIGRATION_12_13, - MIGRATION_13_14, - MIGRATION_14_15, - MIGRATION_15_16, - MIGRATION_16_17, - MIGRATION_17_18, - MIGRATION_18_19, - MIGRATION_19_20, - MIGRATION_20_21, - MIGRATION_21_22, - MIGRATION_22_23, - MIGRATION_23_24, - MIGRATION_24_25, - MIGRATION_25_26, - MIGRATION_26_27, - MIGRATION_27_28, - MIGRATION_28_29, - MIGRATION_29_30, - MIGRATION_30_31, - MIGRATION_31_32, - MIGRATION_32_33, - MIGRATION_33_34, - MIGRATION_34_35, - MIGRATION_35_36, - MIGRATION_36_37, - MIGRATION_37_38, - MIGRATION_38_39, - MIGRATION_39_40, - MIGRATION_40_41, - MIGRATION_41_42, - MIGRATION_42_43, - MIGRATION_43_44, - MIGRATION_44_45, - MIGRATION_45_46, - MIGRATION_46_47, - MIGRATION_47_48, - MIGRATION_48_49, - MIGRATION_49_50, - MIGRATION_50_51, - MIGRATION_51_52, - MIGRATION_52_53, - MIGRATION_53_54, - MIGRATION_54_55, - MIGRATION_55_56, - MIGRATION_56_57, - MIGRATION_57_58, - MIGRATION_58_59, - MIGRATION_59_60, - MIGRATION_60_61, - MIGRATION_61_62, - MIGRATION_62_63, - MIGRATION_63_64, - MIGRATION_64_65, - MIGRATION_65_66, - MIGRATION_66_67, - MIGRATION_67_68, - MIGRATION_68_69 - ) - .allowMainThreadQueries() - //.fallbackToDestructiveMigration() - .build(); - } - } - } - return INSTANCE; - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.kt new file mode 100644 index 00000000..4547d852 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/AppDb.kt @@ -0,0 +1,184 @@ +package pl.szczodrzynski.edziennik.data.db + +import android.content.Context +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.room.TypeConverters +import pl.szczodrzynski.edziennik.config.db.ConfigDao +import pl.szczodrzynski.edziennik.config.db.ConfigEntry +import pl.szczodrzynski.edziennik.data.db.converter.* +import pl.szczodrzynski.edziennik.data.db.dao.* +import pl.szczodrzynski.edziennik.data.db.entity.* +import pl.szczodrzynski.edziennik.data.db.migration.* + +@Database(entities = [ + Grade::class, + Teacher::class, + TeacherAbsence::class, + TeacherAbsenceType::class, + Subject::class, + Notice::class, + Team::class, + Attendance::class, + Event::class, + EventType::class, + LoginStore::class, + Profile::class, + LuckyNumber::class, + Announcement::class, + GradeCategory::class, + FeedbackMessage::class, + Message::class, + MessageRecipient::class, + DebugLog::class, + EndpointTimer::class, + LessonRange::class, + Notification::class, + Classroom::class, + NoticeType::class, + AttendanceType::class, + Lesson::class, + ConfigEntry::class, + LibrusLesson::class, + TimetableManual::class, + Metadata::class +], version = 93) +@TypeConverters( + ConverterTime::class, + ConverterDate::class, + ConverterJsonObject::class, + ConverterListLong::class, + ConverterListString::class, + ConverterDateInt::class +) +abstract class AppDb : RoomDatabase() { + abstract fun gradeDao(): GradeDao + abstract fun teacherDao(): TeacherDao + abstract fun teacherAbsenceDao(): TeacherAbsenceDao + abstract fun teacherAbsenceTypeDao(): TeacherAbsenceTypeDao + abstract fun subjectDao(): SubjectDao + abstract fun noticeDao(): NoticeDao + abstract fun teamDao(): TeamDao + abstract fun attendanceDao(): AttendanceDao + abstract fun eventDao(): EventDao + abstract fun eventTypeDao(): EventTypeDao + abstract fun loginStoreDao(): LoginStoreDao + abstract fun profileDao(): ProfileDao + abstract fun luckyNumberDao(): LuckyNumberDao + abstract fun announcementDao(): AnnouncementDao + abstract fun gradeCategoryDao(): GradeCategoryDao + abstract fun feedbackMessageDao(): FeedbackMessageDao + abstract fun messageDao(): MessageDao + abstract fun messageRecipientDao(): MessageRecipientDao + abstract fun debugLogDao(): DebugLogDao + abstract fun endpointTimerDao(): EndpointTimerDao + abstract fun lessonRangeDao(): LessonRangeDao + abstract fun notificationDao(): NotificationDao + abstract fun classroomDao(): ClassroomDao + abstract fun noticeTypeDao(): NoticeTypeDao + abstract fun attendanceTypeDao(): AttendanceTypeDao + abstract fun timetableDao(): TimetableDao + abstract fun configDao(): ConfigDao + abstract fun librusLessonDao(): LibrusLessonDao + abstract fun timetableManualDao(): TimetableManualDao + abstract fun metadataDao(): MetadataDao + + companion object { + @Volatile private var instance: AppDb? = null + private val LOCK = Any() + + operator fun invoke(context: Context) = instance ?: synchronized(LOCK) { + instance ?: buildDatabase(context).also { instance = it } + } + + private fun buildDatabase(context: Context) = Room.databaseBuilder( + context.applicationContext, + AppDb::class.java, + "edziennik.db" + ).addMigrations( + Migration12(), + Migration13(), + Migration14(), + Migration15(), + Migration16(), + Migration17(), + Migration18(), + Migration19(), + Migration20(), + Migration21(), + Migration22(), + Migration23(), + Migration24(), + Migration25(), + Migration26(), + Migration27(), + Migration28(), + Migration29(), + Migration30(), + Migration31(), + Migration32(), + Migration33(), + Migration34(), + Migration35(), + Migration36(), + Migration37(), + Migration38(), + Migration39(), + Migration40(), + Migration41(), + Migration42(), + Migration43(), + Migration44(), + Migration45(), + Migration46(), + Migration47(), + Migration48(), + Migration49(), + Migration50(), + Migration51(), + Migration52(), + Migration53(), + Migration54(), + Migration55(), + Migration56(), + Migration57(), + Migration58(), + Migration59(), + Migration60(), + Migration61(), + Migration62(), + Migration63(), + Migration64(), + Migration65(), + Migration66(), + Migration67(), + Migration68(), + Migration69(), + Migration70(), + Migration71(), + Migration72(), + Migration73(), + Migration74(), + Migration75(), + Migration76(), + Migration77(), + Migration78(), + Migration79(), + Migration80(), + Migration81(), + Migration82(), + Migration83(), + Migration84(), + Migration85(), + Migration86(), + Migration87(), + Migration88(), + Migration89(), + Migration90(), + Migration91(), + Migration92(), + Migration93() + ).allowMainThreadQueries().build() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterDate.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterDate.kt new file mode 100644 index 00000000..39a42a00 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterDate.kt @@ -0,0 +1,12 @@ +package pl.szczodrzynski.edziennik.data.db.converter + +import androidx.room.TypeConverter +import pl.szczodrzynski.edziennik.utils.models.Date + +class ConverterDate { + @TypeConverter + fun toDate(value: String?): Date? = value?.let { Date.fromY_m_d(it) } + + @TypeConverter + fun toString(value: Date?): String? = value?.stringY_m_d +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterDateInt.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterDateInt.kt new file mode 100644 index 00000000..0ffaadcb --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterDateInt.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-10-17. + */ +package pl.szczodrzynski.edziennik.data.db.converter + +import androidx.room.TypeConverter +import pl.szczodrzynski.edziennik.utils.models.Date + +class ConverterDateInt { + @TypeConverter + fun toDate(value: Int): Date? = if (value == 0) null else Date.fromValue(value) + + @TypeConverter + fun toInt(date: Date?): Int = date?.value ?: 0 +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterJsonObject.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterJsonObject.kt new file mode 100644 index 00000000..bc3a6051 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterJsonObject.kt @@ -0,0 +1,13 @@ +package pl.szczodrzynski.edziennik.data.db.converter + +import androidx.room.TypeConverter +import com.google.gson.JsonObject +import com.google.gson.JsonParser + +class ConverterJsonObject { + @TypeConverter + fun toJsonObject(value: String?): JsonObject? = value?.let { JsonParser().parse(it).asJsonObject } + + @TypeConverter + fun toString(value: JsonObject?): String? = value?.toString() +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterListLong.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterListLong.kt new file mode 100644 index 00000000..5f82925e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterListLong.kt @@ -0,0 +1,13 @@ +package pl.szczodrzynski.edziennik.data.db.converter + +import androidx.room.TypeConverter +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class ConverterListLong { + @TypeConverter + fun toListLong(value: String?): List? = value?.let { Gson().fromJson>(it, object : TypeToken?>() {}.type) } + + @TypeConverter + fun toString(value: List?): String? = value?.let { Gson().toJson(it) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterListString.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterListString.kt new file mode 100644 index 00000000..a024d053 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterListString.kt @@ -0,0 +1,13 @@ +package pl.szczodrzynski.edziennik.data.db.converter + +import androidx.room.TypeConverter +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class ConverterListString { + @TypeConverter + fun toListString(value: String?): List? = value?.let { Gson().fromJson>(it, object : TypeToken?>() {}.type) } + + @TypeConverter + fun toString(value: List?): String? = value?.let { Gson().toJson(it) } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterTime.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterTime.kt new file mode 100644 index 00000000..ae72ea9b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converter/ConverterTime.kt @@ -0,0 +1,16 @@ +package pl.szczodrzynski.edziennik.data.db.converter + +import androidx.room.TypeConverter +import pl.szczodrzynski.edziennik.utils.models.Time + +class ConverterTime { + @TypeConverter + fun toTime(value: String?): Time? = when (value) { + null -> null + "null" -> null + else -> Time.fromHms(value) + } + + @TypeConverter + fun toString(value: Time?): String? = value?.stringValue +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterDate.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterDate.java deleted file mode 100644 index a130362b..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterDate.java +++ /dev/null @@ -1,18 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.converters; - -import androidx.room.TypeConverter; - -import pl.szczodrzynski.edziennik.utils.models.Date; - -public class ConverterDate { - - @TypeConverter - public static Date toDate(String value) { - return value == null ? null : Date.fromY_m_d(value); - } - - @TypeConverter - public static String toString(Date value) { - return value == null ? null : value.getStringY_m_d(); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterDateInt.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterDateInt.java deleted file mode 100644 index 05e72774..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterDateInt.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-17. - */ - -package pl.szczodrzynski.edziennik.data.db.converters; - -import androidx.room.TypeConverter; - -import pl.szczodrzynski.edziennik.utils.models.Date; - -public class ConverterDateInt { - - @TypeConverter - public static Date toDate(int value) { - return Date.fromYmd(Integer.toString(value)); - } - - @TypeConverter - public static int toInt(Date value) { - return value == null ? 0 : value.getValue(); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterJsonObject.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterJsonObject.java deleted file mode 100644 index 47d9b4d4..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterJsonObject.java +++ /dev/null @@ -1,19 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.converters; - -import androidx.room.TypeConverter; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; - -public class ConverterJsonObject { - - @TypeConverter - public static JsonObject toJsonObject(String value) { - return value == null ? null : new JsonParser().parse(value).getAsJsonObject(); - } - - @TypeConverter - public static String toString(JsonObject value) { - return value == null ? null : value.toString(); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterListLong.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterListLong.java deleted file mode 100644 index b5c2ceb1..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterListLong.java +++ /dev/null @@ -1,22 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.converters; - -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; - -import java.util.List; - -import androidx.room.TypeConverter; - -public class ConverterListLong { - - @TypeConverter - public static List toListLong(String value) { - return value == null ? null : new Gson().fromJson(value, new TypeToken>(){}.getType()); - } - - @TypeConverter - public static String toString(List value) { - return value == null ? null : new Gson().toJson(value); - } -} - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterListString.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterListString.java deleted file mode 100644 index 6f579104..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterListString.java +++ /dev/null @@ -1,21 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.converters; - -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; - -import java.util.List; - -import androidx.room.TypeConverter; - -public class ConverterListString { - - @TypeConverter - public static List toListString(String value) { - return value == null ? null : new Gson().fromJson(value, new TypeToken>(){}.getType()); - } - - @TypeConverter - public static String toString(List value) { - return value == null ? null : new Gson().toJson(value); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterTime.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterTime.java deleted file mode 100644 index 63573772..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/converters/ConverterTime.java +++ /dev/null @@ -1,18 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.converters; - -import androidx.room.TypeConverter; - -import pl.szczodrzynski.edziennik.utils.models.Time; - -public class ConverterTime { - - @TypeConverter - public static Time toTime(String value) { - return value == null ? null : value.equals("null") ? null : Time.fromHms(value); - } - - @TypeConverter - public static String toString(Time value) { - return value == null ? null : value.getStringValue(); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.kt new file mode 100644 index 00000000..88b3ccd1 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AnnouncementDao.kt @@ -0,0 +1,69 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Query +import androidx.room.RawQuery +import androidx.sqlite.db.SupportSQLiteQuery +import eu.szkolny.selectivedao.annotation.SelectiveDao +import eu.szkolny.selectivedao.annotation.UpdateSelective +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.db.AppDb +import pl.szczodrzynski.edziennik.data.db.entity.Announcement +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull + +@Dao +@SelectiveDao(db = AppDb::class) +abstract class AnnouncementDao : BaseDao { + companion object { + private const val QUERY = """ + SELECT + *, + teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName + FROM announcements + LEFT JOIN teachers USING(profileId, teacherId) + LEFT JOIN metadata ON announcementId = thingId AND thingType = ${Metadata.TYPE_ANNOUNCEMENT} AND metadata.profileId = announcements.profileId + """ + + private const val ORDER_BY = """ORDER BY addedDate DESC""" + } + + private val selective by lazy { AnnouncementDaoSelective(App.db) } + + @RawQuery(observedEntities = [Announcement::class]) + abstract override fun getRaw(query: SupportSQLiteQuery): LiveData> + @RawQuery(observedEntities = [Announcement::class]) + abstract override fun getOne(query: SupportSQLiteQuery): LiveData + + // SELECTIVE UPDATE + @UpdateSelective(primaryKeys = ["profileId", "announcementId"], skippedColumns = ["addedDate", "announcementText"]) + override fun update(item: Announcement) = selective.update(item) + override fun updateAll(items: List) = selective.updateAll(items) + + // CLEAR + @Query("DELETE FROM announcements WHERE profileId = :profileId") + abstract override fun clear(profileId: Int) + // REMOVE NOT KEPT + @Query("DELETE FROM announcements WHERE keep = 0") + abstract override fun removeNotKept() + + // GET ALL - LIVE DATA + fun getAll(profileId: Int) = + getRaw("$QUERY WHERE announcements.profileId = $profileId $ORDER_BY") + + // GET ALL - NOW + fun getAllNow(profileId: Int) = + getRawNow("$QUERY WHERE announcements.profileId = $profileId $ORDER_BY") + fun getNotNotifiedNow() = + getRawNow("$QUERY WHERE notified = 0 $ORDER_BY") + fun getNotNotifiedNow(profileId: Int) = + getRawNow("$QUERY WHERE announcements.profileId = $profileId AND notified = 0 $ORDER_BY") + + // GET ONE - NOW + fun getByIdNow(profileId: Int, id: Long) = + getOneNow("$QUERY WHERE announcements.profileId = $profileId AND announcementId = $id") +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.kt new file mode 100644 index 00000000..94be0c34 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceDao.kt @@ -0,0 +1,76 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-24. + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Query +import androidx.room.RawQuery +import androidx.sqlite.db.SupportSQLiteQuery +import eu.szkolny.selectivedao.annotation.SelectiveDao +import eu.szkolny.selectivedao.annotation.UpdateSelective +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.db.AppDb +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.full.AttendanceFull +import pl.szczodrzynski.edziennik.utils.models.Date + +@Dao +@SelectiveDao(db = AppDb::class) +abstract class AttendanceDao : BaseDao { + companion object { + private const val QUERY = """ + SELECT + *, + teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName + FROM attendances + LEFT JOIN teachers USING(profileId, teacherId) + LEFT JOIN subjects USING(profileId, subjectId) + LEFT JOIN metadata ON attendanceId = thingId AND thingType = ${Metadata.TYPE_ATTENDANCE} AND metadata.profileId = attendances.profileId + """ + + private const val ORDER_BY = """ORDER BY attendanceDate DESC, attendanceTime DESC""" + } + + private val selective by lazy { AttendanceDaoSelective(App.db) } + + @RawQuery(observedEntities = [Attendance::class]) + abstract override fun getRaw(query: SupportSQLiteQuery): LiveData> + @RawQuery(observedEntities = [Attendance::class]) + abstract override fun getOne(query: SupportSQLiteQuery): LiveData + + // SELECTIVE UPDATE + @UpdateSelective(primaryKeys = ["profileId", "attendanceId"], skippedColumns = ["addedDate", "announcementText"]) + override fun update(item: Attendance) = selective.update(item) + override fun updateAll(items: List) = selective.updateAll(items) + + // CLEAR + @Query("DELETE FROM attendances WHERE profileId = :profileId") + abstract override fun clear(profileId: Int) + // REMOVE NOT KEPT + @Query("DELETE FROM attendances WHERE keep = 0") + abstract override fun removeNotKept() + + // GET ALL - LIVE DATA + fun getAll(profileId: Int) = + getRaw("$QUERY WHERE attendances.profileId = $profileId $ORDER_BY") + + // GET ALL - NOW + fun getAllNow(profileId: Int) = + getRawNow("$QUERY WHERE attendances.profileId = $profileId $ORDER_BY") + fun getNotNotifiedNow() = + getRawNow("$QUERY WHERE notified = 0 $ORDER_BY") + fun getNotNotifiedNow(profileId: Int) = + getRawNow("$QUERY WHERE attendances.profileId = $profileId AND notified = 0 $ORDER_BY") + fun getAllByDateNow(profileId: Int, date: Date) = + getRawNow("$QUERY WHERE attendances.profileId = $profileId AND attendanceDate = '${date.stringY_m_d}' $ORDER_BY") + + // GET ONE - NOW + fun getByIdNow(profileId: Int, id: Long) = + getOneNow("$QUERY WHERE attendances.profileId = $profileId AND attendanceId = $id") + + @Query("UPDATE attendances SET keep = 0 WHERE profileId = :profileId AND attendanceDate >= :date") + abstract fun dontKeepAfterDate(profileId: Int, date: Date?) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceTypeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceTypeDao.kt similarity index 85% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceTypeDao.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceTypeDao.kt index ec9e630a..2dd23f63 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceTypeDao.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/AttendanceTypeDao.kt @@ -2,12 +2,13 @@ * Copyright (c) Kuba Szczodrzyński 2019-10-23. */ -package pl.szczodrzynski.edziennik.data.db.modules.attendance +package pl.szczodrzynski.edziennik.data.db.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.AttendanceType @Dao interface AttendanceTypeDao { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/BaseDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/BaseDao.kt new file mode 100644 index 00000000..0ae961db --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/BaseDao.kt @@ -0,0 +1,123 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-3-28. + */ + +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.* +import androidx.sqlite.db.SimpleSQLiteQuery +import androidx.sqlite.db.SupportSQLiteQuery +import pl.szczodrzynski.edziennik.data.db.entity.Keepable + +@Dao +interface BaseDao { + @RawQuery + fun getRaw(query: SupportSQLiteQuery): LiveData> + fun getRaw(query: String) = getRaw(SimpleSQLiteQuery(query)) + @RawQuery + fun getOne(query: SupportSQLiteQuery): LiveData + fun getOne(query: String) = getOne(SimpleSQLiteQuery(query)) + @RawQuery + fun getRawNow(query: SupportSQLiteQuery): List + fun getRawNow(query: String) = getRawNow(SimpleSQLiteQuery(query)) + @RawQuery + fun getOneNow(query: SupportSQLiteQuery): F? + fun getOneNow(query: String) = getOneNow(SimpleSQLiteQuery(query)) + + fun removeNotKept() + + /** + * INSERT an [item] into the database, + * ignoring any conflicts. + */ + @Insert(onConflict = OnConflictStrategy.IGNORE) + fun add(item: T): Long + /** + * INSERT [items] into the database, + * ignoring any conflicts. + */ + @Insert(onConflict = OnConflictStrategy.IGNORE) + fun addAll(items: List): LongArray + + /** + * REPLACE an [item] in the database, + * removing any conflicting rows. + * Creates the item if it does not exist yet. + */ + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun replace(item: T) + /** + * REPLACE [items] in the database, + * removing any conflicting rows. + * Creates items if it does not exist yet. + */ + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun replaceAll(items: List) + + /** + * Selective UPDATE an [item] in the database. + * Do nothing if a matching item does not exist. + */ + fun update(item: T): Long + /** + * Selective UPDATE [items] in the database. + * Do nothing for those items which do not exist. + */ + fun updateAll(items: List): LongArray + + /** + * Remove all items from the database, + * that match the given [profileId]. + */ + fun clear(profileId: Int) + + /** + * INSERT an [item] into the database, + * doing a selective [update] on conflicts. + * @return the newly inserted item's ID or -1L if the item was updated instead + */ + @Transaction + fun upsert(item: T): Long { + val id = add(item) + if (id == -1L) update(item) + return id + } + /** + * INSERT [items] into the database, + * doing a selective [update] on conflicts. + * @return a [LongArray] of IDs of newly inserted items or -1L if the item existed before + */ + @Transaction + fun upsertAll(items: List, removeNotKept: Boolean = false): LongArray { + val insertResult = addAll(items) + val updateList = mutableListOf() + + insertResult.forEachIndexed { index, result -> + if (result == -1L) updateList.add(items[index]) + } + + if (updateList.isNotEmpty()) updateAll(items) + if (removeNotKept) removeNotKept() + return insertResult + } + + /** + * Make sure that [items] are in the database. + * When [forceReplace] == false, do a selective update (UPSERT). + * When [forceReplace] == true, add all items replacing any conflicting ones (REPLACE). + * + * @param forceReplace whether to replace all items instead of selectively updating + * @param removeNotKept whether to remove all items whose [keep] parameter is false + */ + fun putAll(items: List, forceReplace: Boolean = false, removeNotKept: Boolean = false) { + if (items.isEmpty()) + return + if (forceReplace) + replaceAll(items) + else + upsertAll(items, removeNotKept = false) + + if (removeNotKept) removeNotKept() + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/ClassroomDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ClassroomDao.kt similarity index 85% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/ClassroomDao.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ClassroomDao.kt index 79659f97..0cea965c 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/ClassroomDao.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ClassroomDao.kt @@ -2,12 +2,13 @@ * Copyright (c) Kuba Szczodrzyński 2019-10-23. */ -package pl.szczodrzynski.edziennik.data.db.modules.classrooms +package pl.szczodrzynski.edziennik.data.db.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.Classroom @Dao interface ClassroomDao { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/DebugLogDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/DebugLogDao.java new file mode 100644 index 00000000..8da52a2a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/DebugLogDao.java @@ -0,0 +1,16 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.dao; + +import androidx.room.Dao; +import androidx.room.Insert; + +import pl.szczodrzynski.edziennik.data.db.entity.DebugLog; + +@Dao +public interface DebugLogDao { + @Insert + void add(DebugLog debugLog); +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimerDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EndpointTimerDao.kt similarity index 78% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimerDao.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EndpointTimerDao.kt index ed79694a..c0ff0464 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimerDao.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EndpointTimerDao.kt @@ -1,13 +1,14 @@ /* - * Copyright (c) Kuba Szczodrzyński 2019-10-3. + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 */ -package pl.szczodrzynski.edziennik.data.db.modules.api +package pl.szczodrzynski.edziennik.data.db.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.EndpointTimer @Dao interface EndpointTimerDao { @@ -23,4 +24,4 @@ interface EndpointTimerDao { @Query("DELETE FROM endpointTimers WHERE profileId = :profileId") fun clear(profileId: Int) -} \ No newline at end of file +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt new file mode 100644 index 00000000..897d53ff --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventDao.kt @@ -0,0 +1,159 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Query +import androidx.room.RawQuery +import androidx.room.Transaction +import androidx.sqlite.db.SimpleSQLiteQuery +import androidx.sqlite.db.SupportSQLiteQuery +import eu.szkolny.selectivedao.annotation.SelectiveDao +import eu.szkolny.selectivedao.annotation.UpdateSelective +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.db.AppDb +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time + +@Dao +@SelectiveDao(db = AppDb::class) +abstract class EventDao : BaseDao { + companion object { + private const val QUERY = """ + SELECT + *, + teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName, + eventTypes.eventTypeName AS typeName, + eventTypes.eventTypeColor AS typeColor + FROM events + LEFT JOIN teachers USING(profileId, teacherId) + LEFT JOIN subjects USING(profileId, subjectId) + LEFT JOIN teams USING(profileId, teamId) + LEFT JOIN eventTypes USING(profileId, eventType) + LEFT JOIN metadata ON eventId = thingId AND (thingType = ${Metadata.TYPE_EVENT} OR thingType = ${Metadata.TYPE_HOMEWORK}) AND metadata.profileId = events.profileId + """ + + private const val ORDER_BY = """GROUP BY eventId ORDER BY eventDate, eventTime, addedDate ASC""" + private const val NOT_BLACKLISTED = """events.eventBlacklisted = 0""" + private const val NOT_DONE = """events.eventIsDone = 0""" + } + + private val selective by lazy { EventDaoSelective(App.db) } + + @RawQuery(observedEntities = [Event::class]) + abstract override fun getRaw(query: SupportSQLiteQuery): LiveData> + @RawQuery(observedEntities = [Event::class]) + abstract override fun getOne(query: SupportSQLiteQuery): LiveData + + // SELECTIVE UPDATE + @UpdateSelective(primaryKeys = ["profileId", "eventId"], skippedColumns = ["eventIsDone", "eventBlacklisted", "homeworkBody", "attachmentIds", "attachmentNames"]) + override fun update(item: Event) = selective.update(item) + override fun updateAll(items: List) = selective.updateAll(items) + + // CLEAR + @Query("DELETE FROM events WHERE profileId = :profileId") + abstract override fun clear(profileId: Int) + // REMOVE NOT KEPT + @Query("DELETE FROM events WHERE keep = 0") + abstract override fun removeNotKept() + + // GET ALL - LIVE DATA + fun getAll(profileId: Int) = + getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId $ORDER_BY") + fun getAllByType(profileId: Int, type: Long, filter: String = "1") = + getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventType = $type AND $filter $ORDER_BY") + fun getAllByDate(profileId: Int, date: Date) = + getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventDate = '${date.stringY_m_d}' $ORDER_BY") + fun getAllByDateTime(profileId: Int, date: Date, time: Time) = + getRaw("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventDate = '${date.stringY_m_d}' AND eventTime = '${time.stringValue}' $ORDER_BY") + fun getNearestNotDone(profileId: Int, today: Date, limit: Int) = + getRaw("$QUERY WHERE $NOT_BLACKLISTED AND $NOT_DONE AND events.profileId = $profileId AND eventDate >= '${today.stringY_m_d}' $ORDER_BY LIMIT $limit") + + // GET ALL - NOW + fun getAllNow(profileId: Int) = + getRawNow("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId $ORDER_BY") + fun getNotNotifiedNow() = + getRawNow("$QUERY WHERE $NOT_BLACKLISTED AND notified = 0 $ORDER_BY") + fun getNotNotifiedNow(profileId: Int) = + getRawNow("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND notified = 0 $ORDER_BY") + fun getAllByDateNow(profileId: Int, date: Date) = + getRawNow("$QUERY WHERE $NOT_BLACKLISTED AND events.profileId = $profileId AND eventDate = '${date.stringY_m_d}' $ORDER_BY") + + // GET ONE - NOW + fun getByIdNow(profileId: Int, id: Long) = + getOneNow("$QUERY WHERE events.profileId = $profileId AND eventId = $id") + + + @Query("SELECT eventId FROM events WHERE profileId = :profileId AND eventBlacklisted = 1") + abstract fun getBlacklistedIds(profileId: Int): List + + @get:Query("SELECT eventId FROM events WHERE eventBlacklisted = 1") + abstract val blacklistedIds: List + + /*@Query("UPDATE events SET eventAddedManually = 1 WHERE profileId = :profileId AND eventDate < :date") + abstract fun convertOlderToManual(profileId: Int, date: Date?) + + @Query("DELETE FROM events WHERE teamId = :teamId AND eventId = :id") + abstract fun removeByTeamId(teamId: Long, id: Long) + + @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0") + abstract fun removeNotManual(profileId: Int)*/ + + @RawQuery + abstract fun dontKeepFuture(query: SupportSQLiteQuery?): Long + + @Transaction + open fun dontKeepFuture(profileId: Int, todayDate: Date, filter: String) { + dontKeepFuture(SimpleSQLiteQuery("UPDATE events SET keep = 0 WHERE profileId = " + profileId + + " AND eventAddedManually = 0 AND eventDate >= '" + todayDate.stringY_m_d + "'" + + " AND " + filter)) + } + + @Query("UPDATE events SET keep = 0 WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate") + abstract fun dontKeepFuture(profileId: Int, todayDate: Date) + + @Query("UPDATE events SET keep = 0 WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType = :type") + abstract fun dontKeepFutureWithType(profileId: Int, todayDate: Date, type: Long) + + @Query("UPDATE events SET keep = 0 WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType != :exceptType") + abstract fun dontKeepFutureExceptType(profileId: Int, todayDate: Date, exceptType: Long) + + @Transaction + open fun dontKeepFutureExceptTypes(profileId: Int, todayDate: Date, exceptTypes: List) { + dontKeepFuture(profileId, todayDate, "eventType NOT IN " + exceptTypes.toString().replace('[', '(').replace(']', ')')) + } + + @Query("UPDATE metadata SET seen = :seen WHERE profileId = :profileId AND (thingType = " + Metadata.TYPE_EVENT + " OR thingType = " + Metadata.TYPE_LESSON_CHANGE + " OR thingType = " + Metadata.TYPE_HOMEWORK + ") AND thingId IN (SELECT eventId FROM events WHERE profileId = :profileId AND eventDate = :date)") + abstract fun setSeenByDate(profileId: Int, date: Date, seen: Boolean) + + @Query("UPDATE events SET eventBlacklisted = :blacklisted WHERE profileId = :profileId AND eventId = :eventId") + abstract fun setBlacklisted(profileId: Int, eventId: Long, blacklisted: Boolean) + + @Query("DELETE FROM events WHERE profileId = :profileId AND eventId = :id") + abstract fun remove(profileId: Int, id: Long) + + @Query("DELETE FROM metadata WHERE profileId = :profileId AND thingType = :thingType AND thingId = :thingId") + abstract fun removeMetadata(profileId: Int, thingType: Int, thingId: Long) + + @Transaction + open fun remove(profileId: Int, type: Long, id: Long) { + remove(profileId, id) + removeMetadata(profileId, if (type == Event.TYPE_HOMEWORK) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT, id) + } + + @Transaction + open fun remove(event: Event) { + remove(event.profileId, event.type, event.id) + } + + @Transaction + open fun remove(profileId: Int, event: Event) { + remove(profileId, event.type, event.id) + } + +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventTypeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventTypeDao.kt new file mode 100644 index 00000000..d5006970 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/EventTypeDao.kt @@ -0,0 +1,55 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import android.content.Context +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_DEFAULT +import pl.szczodrzynski.edziennik.data.db.entity.EventType +import pl.szczodrzynski.edziennik.data.db.entity.EventType.Companion.SOURCE_DEFAULT + +@Dao +abstract class EventTypeDao { + @Insert(onConflict = OnConflictStrategy.REPLACE) + abstract fun add(eventType: EventType) + + @Insert(onConflict = OnConflictStrategy.REPLACE) + abstract fun addAll(eventTypeList: List) + + @Query("DELETE FROM eventTypes WHERE profileId = :profileId") + abstract fun clear(profileId: Int) + + @Query("SELECT * FROM eventTypes WHERE profileId = :profileId AND eventType = :typeId") + abstract fun getByIdNow(profileId: Int, typeId: Long): EventType? + + @Query("SELECT * FROM eventTypes WHERE profileId = :profileId") + abstract fun getAll(profileId: Int): LiveData> + + @Query("SELECT * FROM eventTypes WHERE profileId = :profileId") + abstract fun getAllNow(profileId: Int): List + + @get:Query("SELECT * FROM eventTypes") + abstract val allNow: List + + fun addDefaultTypes(context: Context, profileId: Int): List { + var order = 100 + val colorMap = EventType.getTypeColorMap() + val typeList = EventType.getTypeNameMap().map { (id, name) -> + EventType( + profileId = profileId, + id = id, + name = context.getString(name), + color = colorMap[id] ?: COLOR_DEFAULT, + order = order++, + source = SOURCE_DEFAULT + ) + } + addAll(typeList) + return typeList + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/FeedbackMessageDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/FeedbackMessageDao.kt new file mode 100644 index 00000000..7b3159ae --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/FeedbackMessageDao.kt @@ -0,0 +1,35 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.FeedbackMessage + +@Dao +interface FeedbackMessageDao { + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun add(feedbackMessage: FeedbackMessage) + + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun addAll(feedbackMessageList: List) + + @Query("DELETE FROM feedbackMessages") + fun clear() + + @get:Query("SELECT * FROM feedbackMessages ORDER BY sentTime DESC LIMIT 50") + val allNow: List + + @Query("SELECT * FROM feedbackMessages WHERE deviceId = :deviceId ORDER BY sentTime DESC LIMIT 50") + fun getByDeviceIdNow(deviceId: String): List + + @get:Query("SELECT * FROM feedbackMessages") + val all: LiveData> + + @get:Query("SELECT *, COUNT(*) AS count FROM feedbackMessages WHERE received = 1 AND devId IS NULL AND deviceId != 'szkolny.eu' GROUP BY deviceId ORDER BY sentTime DESC") + val allWithCountNow: List +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeCategoryDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeCategoryDao.java similarity index 85% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeCategoryDao.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeCategoryDao.java index 6cdf6bbe..50ec3f22 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeCategoryDao.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeCategoryDao.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.grades; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.dao; import java.util.List; @@ -8,6 +12,8 @@ import androidx.room.Insert; import androidx.room.OnConflictStrategy; import androidx.room.Query; +import pl.szczodrzynski.edziennik.data.db.entity.GradeCategory; + @Dao public interface GradeCategoryDao { @Insert(onConflict = OnConflictStrategy.REPLACE) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.kt new file mode 100644 index 00000000..6254f80b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/GradeDao.kt @@ -0,0 +1,138 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-24. + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Query +import androidx.room.RawQuery +import androidx.room.Transaction +import androidx.sqlite.db.SupportSQLiteQuery +import eu.szkolny.selectivedao.annotation.SelectiveDao +import eu.szkolny.selectivedao.annotation.UpdateSelective +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.db.AppDb +import pl.szczodrzynski.edziennik.data.db.entity.Grade +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.full.GradeFull +import pl.szczodrzynski.edziennik.utils.models.Date +import java.util.* +import kotlin.collections.component1 +import kotlin.collections.component2 +import kotlin.collections.set + +@Dao +@SelectiveDao(db = AppDb::class) +abstract class GradeDao : BaseDao { + companion object { + private const val QUERY = """ + SELECT + *, + teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName + FROM grades + LEFT JOIN teachers USING(profileId, teacherId) + LEFT JOIN subjects USING(profileId, subjectId) + LEFT JOIN metadata ON gradeId = thingId AND thingType = ${Metadata.TYPE_GRADE} AND metadata.profileId = grades.profileId + """ + + private const val ORDER_BY = """ORDER BY addedDate DESC""" + } + + private val selective by lazy { GradeDaoSelective(App.db) } + + @RawQuery(observedEntities = [Grade::class]) + abstract override fun getRaw(query: SupportSQLiteQuery): LiveData> + @RawQuery(observedEntities = [Grade::class]) + abstract override fun getOne(query: SupportSQLiteQuery): LiveData + + // SELECTIVE UPDATE + @UpdateSelective(primaryKeys = ["profileId", "gradeId"], skippedColumns = ["addedDate", "gradeClassAverage"]) + override fun update(item: Grade) = selective.update(item) + override fun updateAll(items: List) = selective.updateAll(items) + + // CLEAR + @Query("DELETE FROM grades WHERE profileId = :profileId") + abstract override fun clear(profileId: Int) + // REMOVE NOT KEPT + @Query("DELETE FROM grades WHERE keep = 0") + abstract override fun removeNotKept() + + // GET ALL - LIVE DATA + fun getAll(profileId: Int) = + getRaw("$QUERY WHERE grades.profileId = $profileId $ORDER_BY") + fun getAllFromDate(profileId: Int, date: Date) = + getRaw("$QUERY WHERE grades.profileId = $profileId AND addedDate > ${date.inMillis} $ORDER_BY") + fun getAllBySubject(profileId: Int, subjectId: Long) = + getRaw("$QUERY WHERE grades.profileId = $profileId AND subjectId = $subjectId $ORDER_BY") + fun getAllOrderBy(profileId: Int, orderBy: String) = + getRaw("$QUERY WHERE grades.profileId = $profileId ORDER BY $orderBy") + + // GET ALL - NOW + fun getAllNow(profileId: Int) = + getRawNow("$QUERY WHERE grades.profileId = $profileId $ORDER_BY") + fun getNotNotifiedNow() = + getRawNow("$QUERY WHERE notified = 0 $ORDER_BY") + fun getNotNotifiedNow(profileId: Int) = + getRawNow("$QUERY WHERE grades.profileId = $profileId AND notified = 0 $ORDER_BY") + fun getByParentIdNow(profileId: Int, parentId: Long) = + getRawNow("$QUERY WHERE grades.profileId = $profileId AND gradeParentId = $parentId $ORDER_BY") + + // GET ONE - NOW + fun getByIdNow(profileId: Int, id: Long) = + getOneNow("$QUERY WHERE grades.profileId = $profileId AND gradeId = $id") + + @Query("UPDATE grades SET keep = 0 WHERE profileId = :profileId AND gradeType = :type") + abstract fun dontKeepWithType(profileId: Int, type: Int) + + @Query("UPDATE grades SET keep = 0 WHERE profileId = :profileId AND gradeSemester = :semester") + abstract fun dontKeepForSemester(profileId: Int, semester: Int) + + @Query("UPDATE grades SET keep = 0 WHERE profileId = :profileId AND gradeSemester = :semester AND gradeType = :type") + abstract fun dontKeepForSemesterWithType(profileId: Int, semester: Int, type: Int) + + + + // GRADE DETAILS - MOBIDZIENNIK + @Query("UPDATE grades SET gradeClassAverage = :classAverage, gradeColor = :color WHERE profileId = :profileId AND gradeId = :gradeId") + abstract fun updateDetailsById(profileId: Int, gradeId: Long, classAverage: Float, color: Int) + + @Query("UPDATE grades SET addedDate = :addedDate WHERE profileId = :profileId AND gradeId = :gradeId") + abstract fun updateAddedDateById(profileId: Int, gradeId: Long, addedDate: Long) + + @Transaction + open fun updateDetails(profileId: Int, gradeAverages: SortedMap, gradeAddedDates: SortedMap, gradeColors: SortedMap) { + for ((gradeId, addedDate) in gradeAddedDates) { + val classAverage = gradeAverages[gradeId] ?: 0.0f + val color = gradeColors[gradeId] ?: 0xff2196f3.toInt() + updateDetailsById(profileId, gradeId, classAverage, color) + updateAddedDateById(profileId, gradeId, addedDate) + } + } + + @Query("SELECT gradeId FROM grades WHERE profileId = :profileId ORDER BY gradeId") + abstract fun getIds(profileId: Int): List + + @Query("SELECT gradeClassAverage FROM grades WHERE profileId = :profileId ORDER BY gradeId") + abstract fun getClassAverages(profileId: Int): List + + @Query("SELECT gradeColor FROM grades WHERE profileId = :profileId ORDER BY gradeId") + abstract fun getColors(profileId: Int): List + + @Query("SELECT addedDate FROM grades WHERE profileId = :profileId ORDER BY gradeId") + abstract fun getAddedDates(profileId: Int): List + + @Transaction + open fun getDetails(profileId: Int, gradeAddedDates: SortedMap, gradeAverages: SortedMap, gradeColors: SortedMap) { + val ids = getIds(profileId).iterator() + val classAverages = getClassAverages(profileId).iterator() + val colors = getColors(profileId).iterator() + val addedDates = getAddedDates(profileId).iterator() + while (ids.hasNext() && classAverages.hasNext() && colors.hasNext() && addedDates.hasNext()) { + val gradeId = ids.next() + gradeAverages[gradeId] = classAverages.next() + gradeColors[gradeId] = colors.next() + gradeAddedDates[gradeId] = addedDates.next() + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRangeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LessonRangeDao.kt similarity index 85% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRangeDao.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LessonRangeDao.kt index 38bb27db..d71fac07 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRangeDao.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LessonRangeDao.kt @@ -2,12 +2,13 @@ * Copyright (c) Kuba Szczodrzyński 2019-10-5. */ -package pl.szczodrzynski.edziennik.data.db.modules.lessons +package pl.szczodrzynski.edziennik.data.db.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.LessonRange @Dao interface LessonRangeDao { @@ -23,4 +24,4 @@ interface LessonRangeDao { @Query("DELETE FROM lessonRanges WHERE profileId = :profileId") fun clear(profileId: Int) -} \ No newline at end of file +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LibrusLessonDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LibrusLessonDao.kt new file mode 100644 index 00000000..6afcc2ba --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LibrusLessonDao.kt @@ -0,0 +1,26 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-6. + */ + +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.LibrusLesson + +@Dao +interface LibrusLessonDao { + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun add(librusLesson: LibrusLesson) + + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun addAll(librusLessonList: List) + + @Query("SELECT * FROM librusLessons WHERE profileId = :profileId") + fun getAllNow(profileId: Int): List + + @Query("DELETE FROM librusLessons WHERE profileId = :profileId") + fun clear(profileId: Int) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStoreDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LoginStoreDao.java similarity index 78% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStoreDao.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LoginStoreDao.java index 49fc3eea..a7cb92d2 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStoreDao.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LoginStoreDao.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.login; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.dao; import androidx.lifecycle.LiveData; import androidx.room.Dao; @@ -8,7 +12,7 @@ import androidx.room.Query; import java.util.List; -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull; +import pl.szczodrzynski.edziennik.data.db.entity.LoginStore; @Dao public abstract class LoginStoreDao { @@ -27,10 +31,6 @@ public abstract class LoginStoreDao { @Query("SELECT * FROM loginStores WHERE loginStoreId = :loginStoreId") public abstract LoginStore getByIdNow(int loginStoreId); - public void add(ProfileFull profileFull) { - add(new LoginStore(profileFull.getLoginStoreId(), profileFull.getLoginStoreType(), profileFull.getLoginStoreData())); - } - @Query("UPDATE loginStores SET loginStoreId = :targetId WHERE loginStoreId = :sourceId") public abstract void changeId(int sourceId, int targetId); diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.kt new file mode 100644 index 00000000..3c752124 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/LuckyNumberDao.kt @@ -0,0 +1,74 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Query +import androidx.room.RawQuery +import androidx.sqlite.db.SupportSQLiteQuery +import eu.szkolny.selectivedao.annotation.SelectiveDao +import eu.szkolny.selectivedao.annotation.UpdateSelective +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.db.AppDb +import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.full.LuckyNumberFull +import pl.szczodrzynski.edziennik.utils.models.Date + +@Dao +@SelectiveDao(db = AppDb::class) +abstract class LuckyNumberDao : BaseDao { + companion object { + private const val QUERY = """ + SELECT + * + FROM luckyNumbers + LEFT JOIN metadata ON luckyNumberDate = thingId AND thingType = ${Metadata.TYPE_LUCKY_NUMBER} AND metadata.profileId = luckyNumbers.profileId + """ + + private const val ORDER_BY = """ORDER BY luckyNumberDate DESC""" + } + + private val selective by lazy { LuckyNumberDaoSelective(App.db) } + + @RawQuery(observedEntities = [LuckyNumber::class]) + abstract override fun getRaw(query: SupportSQLiteQuery): LiveData> + @RawQuery(observedEntities = [LuckyNumber::class]) + abstract override fun getOne(query: SupportSQLiteQuery): LiveData + + // SELECTIVE UPDATE + @UpdateSelective(primaryKeys = ["profileId", "luckyNumberDate"], skippedColumns = ["addedDate"]) + override fun update(item: LuckyNumber) = selective.update(item) + override fun updateAll(items: List) = selective.updateAll(items) + + // CLEAR + @Query("DELETE FROM luckyNumbers WHERE profileId = :profileId") + abstract override fun clear(profileId: Int) + // REMOVE NOT KEPT + @Query("DELETE FROM luckyNumbers WHERE keep = 0") + abstract override fun removeNotKept() + + // GET ALL - LIVE DATA + fun getAll(profileId: Int) = + getRaw("$QUERY WHERE luckyNumbers.profileId = $profileId $ORDER_BY") + + // GET ALL - NOW + fun getAllNow(profileId: Int) = + getRawNow("$QUERY WHERE luckyNumbers.profileId = $profileId $ORDER_BY") + fun getNotNotifiedNow() = + getRawNow("$QUERY WHERE notified = 0 $ORDER_BY") + fun getNotNotifiedNow(profileId: Int) = + getRawNow("$QUERY WHERE luckyNumbers.profileId = $profileId AND notified = 0 $ORDER_BY") + + // GET ONE - LIVE DATA + fun getNearestFuture(profileId: Int, today: Date) = + getOne("$QUERY WHERE luckyNumbers.profileId = $profileId AND luckyNumberDate >= ${today.value} $ORDER_BY LIMIT 1") + + // GET ONE - NOW + fun getByIdNow(profileId: Int, id: Long) = + getOneNow("$QUERY WHERE attendances.profileId = $profileId AND attendanceId = $id") + fun getNearestFutureNow(profileId: Int, today: Date) = + getOneNow("$QUERY WHERE luckyNumbers.profileId = $profileId AND luckyNumberDate >= ${today.value} $ORDER_BY LIMIT 1") +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.kt new file mode 100644 index 00000000..51d56854 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageDao.kt @@ -0,0 +1,75 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Query +import androidx.room.RawQuery +import androidx.sqlite.db.SupportSQLiteQuery +import eu.szkolny.selectivedao.annotation.SelectiveDao +import eu.szkolny.selectivedao.annotation.UpdateSelective +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.db.AppDb +import pl.szczodrzynski.edziennik.data.db.entity.Message +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.full.MessageFull + +@Dao +@SelectiveDao(db = AppDb::class) +abstract class MessageDao : BaseDao { + companion object { + private const val QUERY = """ + SELECT + *, + teachers.teacherName ||" "|| teachers.teacherSurname AS senderName + FROM messages + LEFT JOIN teachers ON teachers.profileId = messages.profileId AND teacherId = senderId + LEFT JOIN metadata ON messageId = thingId AND thingType = ${Metadata.TYPE_MESSAGE} AND metadata.profileId = messages.profileId + """ + + private const val ORDER_BY = """ORDER BY messageIsPinned, addedDate DESC""" + } + + private val selective by lazy { MessageDaoSelective(App.db) } + + @RawQuery(observedEntities = [Message::class]) + abstract override fun getRaw(query: SupportSQLiteQuery): LiveData> + @RawQuery(observedEntities = [Message::class]) + abstract override fun getOne(query: SupportSQLiteQuery): LiveData + + // SELECTIVE UPDATE + @UpdateSelective(primaryKeys = ["profileId", "messageId"], skippedColumns = ["messageType", "messageBody", "messageIsPinned", "attachmentIds", "attachmentNames", "attachmentSizes"]) + override fun update(item: Message) = selective.update(item) + override fun updateAll(items: List) = selective.updateAll(items) + + // CLEAR + @Query("DELETE FROM messages WHERE profileId = :profileId") + abstract override fun clear(profileId: Int) + // REMOVE NOT KEPT + @Query("DELETE FROM messages WHERE keep = 0") + abstract override fun removeNotKept() + + // GET ALL - LIVE DATA + fun getAll(profileId: Int) = + getRaw("$QUERY WHERE messages.profileId = $profileId $ORDER_BY") + fun getAllByType(profileId: Int, type: Int) = + getRaw("$QUERY WHERE messages.profileId = $profileId AND messageType = $type $ORDER_BY") + fun getReceived(profileId: Int) = getAllByType(profileId, Message.TYPE_RECEIVED) + fun getSent(profileId: Int) = getAllByType(profileId, Message.TYPE_SENT) + fun getDeleted(profileId: Int) = getAllByType(profileId, Message.TYPE_DELETED) + fun getDraft(profileId: Int) = getAllByType(profileId, Message.TYPE_DRAFT) + + // GET ALL - NOW + fun getAllNow(profileId: Int) = + getRawNow("$QUERY WHERE messages.profileId = $profileId $ORDER_BY") + fun getNotNotifiedNow() = + getRawNow("$QUERY WHERE notified = 0 AND messageType = ${Message.TYPE_RECEIVED} $ORDER_BY") + + // GET ONE - NOW + fun getByIdNow(profileId: Int, id: Long) = + getOneNow("$QUERY WHERE messages.profileId = $profileId AND messageId = $id") + + +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageRecipientDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageRecipientDao.java similarity index 89% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageRecipientDao.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageRecipientDao.java index 4bd876e3..20e6fe90 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageRecipientDao.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MessageRecipientDao.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.messages; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.dao; import java.util.List; @@ -10,6 +14,9 @@ import androidx.room.RawQuery; import androidx.sqlite.db.SimpleSQLiteQuery; import androidx.sqlite.db.SupportSQLiteQuery; +import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient; +import pl.szczodrzynski.edziennik.data.db.full.MessageRecipientFull; + @Dao public abstract class MessageRecipientDao { @Query("DELETE FROM messageRecipients WHERE profileId = :profileId") diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/metadata/MetadataDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MetadataDao.java similarity index 62% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/metadata/MetadataDao.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MetadataDao.java index 37238a6d..eac92f21 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/metadata/MetadataDao.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/MetadataDao.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.metadata; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.dao; import androidx.lifecycle.LiveData; import androidx.room.Dao; @@ -9,24 +13,24 @@ import androidx.room.Transaction; import java.util.List; -import pl.szczodrzynski.edziennik.data.db.modules.announcements.Announcement; -import pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance; -import pl.szczodrzynski.edziennik.data.db.modules.events.Event; -import pl.szczodrzynski.edziennik.data.db.modules.grades.Grade; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange; -import pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonFull; -import pl.szczodrzynski.edziennik.data.db.modules.messages.Message; -import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice; +import pl.szczodrzynski.edziennik.data.db.entity.Announcement; +import pl.szczodrzynski.edziennik.data.db.entity.Attendance; +import pl.szczodrzynski.edziennik.data.db.entity.Event; +import pl.szczodrzynski.edziennik.data.db.entity.Grade; +import pl.szczodrzynski.edziennik.data.db.entity.Message; +import pl.szczodrzynski.edziennik.data.db.entity.Metadata; +import pl.szczodrzynski.edziennik.data.db.entity.Notice; +import pl.szczodrzynski.edziennik.data.db.full.LessonFull; import pl.szczodrzynski.edziennik.utils.models.UnreadCounter; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_ANNOUNCEMENT; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_ATTENDANCE; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_EVENT; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_GRADE; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_HOMEWORK; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_LESSON_CHANGE; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_MESSAGE; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_NOTICE; +import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_ANNOUNCEMENT; +import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_ATTENDANCE; +import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_EVENT; +import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_GRADE; +import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_HOMEWORK; +import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_LESSON_CHANGE; +import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_MESSAGE; +import static pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_NOTICE; @Dao public abstract class MetadataDao { @@ -36,6 +40,9 @@ public abstract class MetadataDao { @Insert(onConflict = OnConflictStrategy.IGNORE) public abstract void addAllIgnore(List metadataList); + @Insert(onConflict = OnConflictStrategy.REPLACE) + public abstract void addAllReplace(List metadataList); + @Query("UPDATE metadata SET seen = :seen WHERE thingId = :thingId AND thingType = :thingType AND profileId = :profileId") abstract void updateSeen(int profileId, int thingType, long thingId, boolean seen); @@ -56,48 +63,38 @@ public abstract class MetadataDao { @Transaction public void setSeen(int profileId, Object o, boolean seen) { if (o instanceof Grade) { - if (add(new Metadata(profileId, TYPE_GRADE, ((Grade) o).id, seen, false, 0)) == -1) { - updateSeen(profileId, TYPE_GRADE, ((Grade) o).id, seen); + if (add(new Metadata(profileId, TYPE_GRADE, ((Grade) o).getId(), seen, false)) == -1) { + updateSeen(profileId, TYPE_GRADE, ((Grade) o).getId(), seen); } } if (o instanceof Attendance) { - if (add(new Metadata(profileId, TYPE_ATTENDANCE, ((Attendance) o).id, seen, false, 0)) == -1) { - updateSeen(profileId, TYPE_ATTENDANCE, ((Attendance) o).id, seen); + if (add(new Metadata(profileId, TYPE_ATTENDANCE, ((Attendance) o).getId(), seen, false)) == -1) { + updateSeen(profileId, TYPE_ATTENDANCE, ((Attendance) o).getId(), seen); } } if (o instanceof Notice) { - if (add(new Metadata(profileId, TYPE_NOTICE, ((Notice) o).id, seen, false, 0)) == -1) { - updateSeen(profileId, TYPE_NOTICE, ((Notice) o).id, seen); + if (add(new Metadata(profileId, TYPE_NOTICE, ((Notice) o).getId(), seen, false)) == -1) { + updateSeen(profileId, TYPE_NOTICE, ((Notice) o).getId(), seen); } } if (o instanceof Event) { - if (add(new Metadata(profileId, ((Event) o).type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).id, seen, false, 0)) == -1) { - updateSeen(profileId, ((Event) o).type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).id, seen); - } - } - if (o instanceof LessonChange) { - if (add(new Metadata(profileId, TYPE_LESSON_CHANGE, ((LessonChange) o).id, seen, false, 0)) == -1) { - updateSeen(profileId, TYPE_LESSON_CHANGE, ((LessonChange) o).id, seen); + if (add(new Metadata(profileId, ((Event) o).getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).getId(), seen, false)) == -1) { + updateSeen(profileId, ((Event) o).getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).getId(), seen); } } if (o instanceof LessonFull) { - if (add(new Metadata(profileId, TYPE_LESSON_CHANGE, ((LessonFull) o).changeId, seen, false, 0)) == -1) { - updateSeen(profileId, TYPE_LESSON_CHANGE, ((LessonFull) o).changeId, seen); - } - } - if (o instanceof pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull) { - if (add(new Metadata(profileId, TYPE_LESSON_CHANGE, ((pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull) o).getId(), seen, false, 0)) == -1) { - updateSeen(profileId, TYPE_LESSON_CHANGE, ((pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull) o).getId(), seen); + if (add(new Metadata(profileId, TYPE_LESSON_CHANGE, ((LessonFull) o).getId(), seen, false)) == -1) { + updateSeen(profileId, TYPE_LESSON_CHANGE, ((LessonFull) o).getId(), seen); } } if (o instanceof Announcement) { - if (add(new Metadata(profileId, TYPE_ANNOUNCEMENT, ((Announcement) o).id, seen, false, 0)) == -1) { - updateSeen(profileId, TYPE_ANNOUNCEMENT, ((Announcement) o).id, seen); + if (add(new Metadata(profileId, TYPE_ANNOUNCEMENT, ((Announcement) o).getId(), seen, false)) == -1) { + updateSeen(profileId, TYPE_ANNOUNCEMENT, ((Announcement) o).getId(), seen); } } if (o instanceof Message) { - if (add(new Metadata(profileId, TYPE_MESSAGE, ((Message) o).id, seen, false, 0)) == -1) { - updateSeen(profileId, TYPE_MESSAGE, ((Message) o).id, seen); + if (add(new Metadata(profileId, TYPE_MESSAGE, ((Message) o).getId(), seen, false)) == -1) { + updateSeen(profileId, TYPE_MESSAGE, ((Message) o).getId(), seen); } } } @@ -105,48 +102,38 @@ public abstract class MetadataDao { @Transaction public void setNotified(int profileId, Object o, boolean notified) { if (o instanceof Grade) { - if (add(new Metadata(profileId, TYPE_GRADE, ((Grade) o).id, false, notified, 0)) == -1) { - updateNotified(profileId, TYPE_GRADE, ((Grade) o).id, notified); + if (add(new Metadata(profileId, TYPE_GRADE, ((Grade) o).getId(), false, notified)) == -1) { + updateNotified(profileId, TYPE_GRADE, ((Grade) o).getId(), notified); } } if (o instanceof Attendance) { - if (add(new Metadata(profileId, TYPE_ATTENDANCE, ((Attendance) o).id, false, notified, 0)) == -1) { - updateNotified(profileId, TYPE_ATTENDANCE, ((Attendance) o).id, notified); + if (add(new Metadata(profileId, TYPE_ATTENDANCE, ((Attendance) o).getId(), false, notified)) == -1) { + updateNotified(profileId, TYPE_ATTENDANCE, ((Attendance) o).getId(), notified); } } if (o instanceof Notice) { - if (add(new Metadata(profileId, TYPE_NOTICE, ((Notice) o).id, false, notified, 0)) == -1) { - updateNotified(profileId, TYPE_NOTICE, ((Notice) o).id, notified); + if (add(new Metadata(profileId, TYPE_NOTICE, ((Notice) o).getId(), false, notified)) == -1) { + updateNotified(profileId, TYPE_NOTICE, ((Notice) o).getId(), notified); } } if (o instanceof Event) { - if (add(new Metadata(profileId, ((Event) o).type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).id, false, notified, 0)) == -1) { - updateNotified(profileId, ((Event) o).type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).id, notified); - } - } - if (o instanceof LessonChange) { - if (add(new Metadata(profileId, TYPE_LESSON_CHANGE, ((LessonChange) o).id, false, notified, 0)) == -1) { - updateNotified(profileId, TYPE_LESSON_CHANGE, ((LessonChange) o).id, notified); + if (add(new Metadata(profileId, ((Event) o).getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).getId(), false, notified)) == -1) { + updateNotified(profileId, ((Event) o).getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, ((Event) o).getId(), notified); } } if (o instanceof LessonFull) { - if (add(new Metadata(profileId, TYPE_LESSON_CHANGE, ((LessonFull) o).changeId, false, notified, 0)) == -1) { - updateNotified(profileId, TYPE_LESSON_CHANGE, ((LessonFull) o).changeId, notified); - } - } - if (o instanceof pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull) { - if (add(new Metadata(profileId, TYPE_LESSON_CHANGE, ((pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull) o).getId(), false, notified, 0)) == -1) { - updateNotified(profileId, TYPE_LESSON_CHANGE, ((pl.szczodrzynski.edziennik.data.db.modules.timetable.LessonFull) o).getId(), notified); + if (add(new Metadata(profileId, TYPE_LESSON_CHANGE, ((LessonFull) o).getId(), false, notified)) == -1) { + updateNotified(profileId, TYPE_LESSON_CHANGE, ((LessonFull) o).getId(), notified); } } if (o instanceof Announcement) { - if (add(new Metadata(profileId, TYPE_ANNOUNCEMENT, ((Announcement) o).id, false, notified, 0)) == -1) { - updateNotified(profileId, TYPE_ANNOUNCEMENT, ((Announcement) o).id, notified); + if (add(new Metadata(profileId, TYPE_ANNOUNCEMENT, ((Announcement) o).getId(), false, notified)) == -1) { + updateNotified(profileId, TYPE_ANNOUNCEMENT, ((Announcement) o).getId(), notified); } } if (o instanceof Message) { - if (add(new Metadata(profileId, TYPE_MESSAGE, ((Message) o).id, false, notified, 0)) == -1) { - updateNotified(profileId, TYPE_MESSAGE, ((Message) o).id, notified); + if (add(new Metadata(profileId, TYPE_MESSAGE, ((Message) o).getId(), false, notified)) == -1) { + updateNotified(profileId, TYPE_MESSAGE, ((Message) o).getId(), notified); } } } @@ -154,9 +141,9 @@ public abstract class MetadataDao { @Transaction public void setBoth(int profileId, Event o, boolean seen, boolean notified, long addedDate) { if (o != null) { - if (add(new Metadata(profileId, o.type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.id, seen, notified, addedDate)) == -1) { - updateSeen(profileId, o.type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.id, seen); - updateNotified(profileId, o.type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.id, notified); + if (add(new Metadata(profileId, o.getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.getId(), seen, notified)) == -1) { + updateSeen(profileId, o.getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.getId(), seen); + updateNotified(profileId, o.getType() == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, o.getId(), notified); } } } @@ -172,9 +159,18 @@ public abstract class MetadataDao { @Query("UPDATE metadata SET seen = :seen WHERE profileId = :profileId") public abstract void setAllSeen(int profileId, boolean seen); + @Query("UPDATE metadata SET seen = :seen WHERE profileId = :profileId AND thingType != " + TYPE_MESSAGE) + public abstract void setAllSeenExceptMessages(int profileId, boolean seen); + + @Query("UPDATE metadata SET seen = :seen WHERE profileId = :profileId AND thingType != " + TYPE_MESSAGE + " AND thingType != " + TYPE_ANNOUNCEMENT) + public abstract void setAllSeenExceptMessagesAndAnnouncements(int profileId, boolean seen); + @Query("UPDATE metadata SET notified = :notified WHERE profileId = :profileId") public abstract void setAllNotified(int profileId, boolean notified); + @Query("UPDATE metadata SET notified = :notified") + public abstract void setAllNotified(boolean notified); + @Query("SELECT count() FROM metadata WHERE profileId = :profileId AND thingType = :thingType AND seen = 0") @@ -222,9 +218,6 @@ public abstract class MetadataDao { @Query("DELETE FROM metadata WHERE profileId = :profileId AND thingType = "+TYPE_HOMEWORK+" AND thingId NOT IN (SELECT eventId FROM events WHERE profileId = :profileId AND eventType = -1);") public abstract void deleteUnusedHomework(int profileId); - @Query("DELETE FROM metadata WHERE profileId = :profileId AND thingType = "+TYPE_LESSON_CHANGE+" AND thingId NOT IN (SELECT lessonChangeId FROM lessonChanges WHERE profileId = :profileId);") - public abstract void deleteUnusedLessonChanges(int profileId); - @Query("DELETE FROM metadata WHERE profileId = :profileId AND thingType = "+TYPE_ANNOUNCEMENT+" AND thingId NOT IN (SELECT announcementId FROM announcements WHERE profileId = :profileId);") public abstract void deleteUnusedAnnouncements(int profileId); @@ -238,7 +231,6 @@ public abstract class MetadataDao { deleteUnusedAttendance(profileId); deleteUnusedEvents(profileId); deleteUnusedHomework(profileId); - deleteUnusedLessonChanges(profileId); deleteUnusedAnnouncements(profileId); deleteUnusedMessages(profileId); } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.kt new file mode 100644 index 00000000..51f3e839 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeDao.kt @@ -0,0 +1,72 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Query +import androidx.room.RawQuery +import androidx.sqlite.db.SupportSQLiteQuery +import eu.szkolny.selectivedao.annotation.SelectiveDao +import eu.szkolny.selectivedao.annotation.UpdateSelective +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.db.AppDb +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.Notice +import pl.szczodrzynski.edziennik.data.db.full.NoticeFull + +@Dao +@SelectiveDao(db = AppDb::class) +abstract class NoticeDao : BaseDao { + companion object { + private const val QUERY = """ + SELECT + *, + teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName + FROM notices + LEFT JOIN teachers USING(profileId, teacherId) + LEFT JOIN metadata ON noticeId = thingId AND thingType = ${Metadata.TYPE_NOTICE} AND metadata.profileId = notices.profileId + """ + + private const val ORDER_BY = """ORDER BY addedDate DESC""" + } + + private val selective by lazy { NoticeDaoSelective(App.db) } + + @RawQuery(observedEntities = [Notice::class]) + abstract override fun getRaw(query: SupportSQLiteQuery): LiveData> + @RawQuery(observedEntities = [Notice::class]) + abstract override fun getOne(query: SupportSQLiteQuery): LiveData + + // SELECTIVE UPDATE + @UpdateSelective(primaryKeys = ["profileId", "noticeId"], skippedColumns = ["addedDate"]) + override fun update(item: Notice) = selective.update(item) + override fun updateAll(items: List) = selective.updateAll(items) + + // CLEAR + @Query("DELETE FROM notices WHERE profileId = :profileId") + abstract override fun clear(profileId: Int) + // REMOVE NOT KEPT + @Query("DELETE FROM notices WHERE keep = 0") + abstract override fun removeNotKept() + + // GET ALL - LIVE DATA + fun getAll(profileId: Int) = + getRaw("$QUERY WHERE notices.profileId = $profileId $ORDER_BY") + + // GET ALL - NOW + fun getAllNow(profileId: Int) = + getRawNow("$QUERY WHERE notices.profileId = $profileId $ORDER_BY") + fun getNotNotifiedNow() = + getRawNow("$QUERY WHERE notified = 0 $ORDER_BY") + fun getNotNotifiedNow(profileId: Int) = + getRawNow("$QUERY WHERE notices.profileId = $profileId AND notified = 0 $ORDER_BY") + + // GET ONE - NOW + fun getByIdNow(profileId: Int, id: Long) = + getOneNow("$QUERY WHERE notices.profileId = $profileId AND noticeId = $id") + + @Query("UPDATE notices SET keep = 0 WHERE profileId = :profileId AND noticeSemester = :semester") + abstract fun dontKeepSemester(profileId: Int, semester: Int) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeTypeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeTypeDao.kt similarity index 85% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeTypeDao.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeTypeDao.kt index 5415c442..cf1fd527 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeTypeDao.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NoticeTypeDao.kt @@ -2,12 +2,13 @@ * Copyright (c) Kuba Szczodrzyński 2019-10-23. */ -package pl.szczodrzynski.edziennik.data.db.modules.notices +package pl.szczodrzynski.edziennik.data.db.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.NoticeType @Dao interface NoticeTypeDao { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/NotificationDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NotificationDao.kt similarity index 81% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/NotificationDao.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NotificationDao.kt index ee666240..a8ae22b9 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/NotificationDao.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/NotificationDao.kt @@ -2,13 +2,15 @@ * Copyright (c) Kuba Szczodrzyński 2019-10-18. */ -package pl.szczodrzynski.edziennik.data.db.modules.notification +package pl.szczodrzynski.edziennik.data.db.dao +import android.database.Cursor import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.Notification @Dao interface NotificationDao { @@ -35,4 +37,7 @@ interface NotificationDao { @Query("UPDATE notifications SET posted = 1 WHERE posted = 0") fun setAllPosted() -} \ No newline at end of file + + @Query("SELECT * FROM notifications ORDER BY addedDate DESC") + fun getAllCursor(): Cursor +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ProfileDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ProfileDao.kt new file mode 100644 index 00000000..6d1e799d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/ProfileDao.kt @@ -0,0 +1,69 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.Profile + +@Dao +interface ProfileDao { + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun add(profile: Profile) + + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun addAll(profileList: List) + + @Query("DELETE FROM profiles WHERE profileId = :profileId") + fun remove(profileId: Int) + + @Query("SELECT profiles.* FROM profiles WHERE profileId = :profileId") + fun getById(profileId: Int): LiveData + + @Query("SELECT * FROM profiles WHERE profileId = :profileId") + fun getByIdNow(profileId: Int): Profile? + + @get:Query("SELECT * FROM profiles WHERE profileId >= 0 ORDER BY profileId") + val all: LiveData> + + @get:Query("SELECT * FROM profiles WHERE profileId >= 0 ORDER BY profileId") + val allNow: List + + @get:Query("SELECT COUNT(profileId) FROM profiles WHERE profileId >= 0") + val count: Int + + @Query("SELECT profileId FROM profiles WHERE loginStoreId = :loginStoreId ORDER BY profileId") + fun getIdsByLoginStoreIdNow(loginStoreId: Int): List + + @get:Query("SELECT * FROM profiles WHERE syncEnabled = 1 AND archived = 0 AND profileId >= 0 ORDER BY profileId") + val profilesForFirebaseNow: List + + @get:Query("SELECT profileId FROM profiles WHERE syncEnabled = 1 AND archived = 0 AND profileId >= 0 ORDER BY profileId") + val idsForSyncNow: List + + @get:Query("SELECT profileId FROM profiles WHERE profileId >= 0 ORDER BY profileId") + val idsNow: List + + @Query("SELECT profiles.* FROM teams JOIN profiles USING(profileId) WHERE teamCode = :teamCode AND registration = " + Profile.REGISTRATION_ENABLED + " AND enableSharedEvents = 1") + fun getByTeamCodeNowWithRegistration(teamCode: String?): List + + @get:Query("SELECT profileId FROM profiles WHERE profileId > 0 ORDER BY profileId ASC LIMIT 1") + val firstId: Int? + + @get:Query("SELECT profileId FROM profiles WHERE profileId > 0 ORDER BY profileId DESC LIMIT 1") + val lastId: Int? + + @Query("UPDATE profiles SET empty = 0") + fun setAllNotEmpty() + + @Query("SELECT * FROM profiles WHERE archiveId = :archiveId AND archived = 1") + fun getArchivesOf(archiveId: Int): List + + @Query("SELECT * FROM profiles WHERE archiveId = :archiveId AND archived = 0 ORDER BY profileId DESC LIMIT 1") + fun getNotArchivedOf(archiveId: Int): Profile? +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/subjects/SubjectDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/SubjectDao.java similarity index 86% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/subjects/SubjectDao.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/SubjectDao.java index 1698efce..215ca56d 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/subjects/SubjectDao.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/SubjectDao.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.subjects; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.dao; import androidx.lifecycle.LiveData; import androidx.room.Dao; @@ -8,6 +12,8 @@ import androidx.room.Query; import java.util.List; +import pl.szczodrzynski.edziennik.data.db.entity.Subject; + @Dao public interface SubjectDao { @Insert(onConflict = OnConflictStrategy.REPLACE) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceDao.kt new file mode 100644 index 00000000..f12248b8 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceDao.kt @@ -0,0 +1,74 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Query +import androidx.room.RawQuery +import androidx.sqlite.db.SupportSQLiteQuery +import eu.szkolny.selectivedao.annotation.SelectiveDao +import eu.szkolny.selectivedao.annotation.UpdateSelective +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.db.AppDb +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.entity.TeacherAbsence +import pl.szczodrzynski.edziennik.data.db.full.TeacherAbsenceFull +import pl.szczodrzynski.edziennik.utils.models.Date + +@Dao +@SelectiveDao(db = AppDb::class) +abstract class TeacherAbsenceDao : BaseDao { + companion object { + private const val QUERY = """ + SELECT + *, + teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName + FROM teacherAbsence + LEFT JOIN teachers USING(profileId, teacherId) + LEFT JOIN metadata ON teacherAbsenceId = thingId AND thingType = ${Metadata.TYPE_TEACHER_ABSENCE} AND metadata.profileId = teacherAbsence.profileId + """ + + private const val ORDER_BY = """ORDER BY teacherAbsenceDateFrom ASC""" + } + + private val selective by lazy { TeacherAbsenceDaoSelective(App.db) } + + @RawQuery(observedEntities = [TeacherAbsence::class]) + abstract override fun getRaw(query: SupportSQLiteQuery): LiveData> + @RawQuery(observedEntities = [TeacherAbsence::class]) + abstract override fun getOne(query: SupportSQLiteQuery): LiveData + + // SELECTIVE UPDATE + @UpdateSelective(primaryKeys = ["profileId", "teacherAbsenceId"], skippedColumns = ["addedDate"]) + override fun update(item: TeacherAbsence) = selective.update(item) + override fun updateAll(items: List) = selective.updateAll(items) + + // CLEAR + @Query("DELETE FROM teacherAbsence WHERE profileId = :profileId") + abstract override fun clear(profileId: Int) + // REMOVE NOT KEPT + @Query("DELETE FROM teacherAbsence WHERE keep = 0") + abstract override fun removeNotKept() + + // GET ALL - LIVE DATA + fun getAll(profileId: Int) = + getRaw("$QUERY WHERE teacherAbsence.profileId = $profileId $ORDER_BY") + fun getAllByDate(profileId: Int, date: Date) = + getRaw("$QUERY WHERE teacherAbsence.profileId = $profileId AND '${date.stringY_m_d}' BETWEEN teacherAbsenceDateFrom AND teacherAbsenceDateTo $ORDER_BY") + + // GET ALL - NOW + fun getAllNow(profileId: Int) = + getRawNow("$QUERY WHERE teacherAbsence.profileId = $profileId $ORDER_BY") + fun getNotNotifiedNow() = + getRawNow("$QUERY WHERE notified = 0 $ORDER_BY") + fun getNotNotifiedNow(profileId: Int) = + getRawNow("$QUERY WHERE teacherAbsence.profileId = $profileId AND notified = 0 $ORDER_BY") + fun getAllByDateNow(profileId: Int, date: Date) = + getRawNow("$QUERY WHERE teacherAbsence.profileId = $profileId AND '${date.stringY_m_d}' BETWEEN teacherAbsenceDateFrom AND teacherAbsenceDateTo $ORDER_BY") + + // GET ONE - NOW + fun getByIdNow(profileId: Int, id: Long) = + getOneNow("$QUERY WHERE teacherAbsence.profileId = $profileId AND teacherAbsenceId = $id") +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceTypeDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceTypeDao.kt similarity index 85% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceTypeDao.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceTypeDao.kt index 12dbf591..b4b8ab24 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceTypeDao.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherAbsenceTypeDao.kt @@ -2,12 +2,13 @@ * Copyright (c) Kacper Ziubryniewicz 2019-10-18 */ -package pl.szczodrzynski.edziennik.data.db.modules.teachers +package pl.szczodrzynski.edziennik.data.db.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query +import pl.szczodrzynski.edziennik.data.db.entity.TeacherAbsenceType @Dao interface TeacherAbsenceTypeDao { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherDao.kt similarity index 50% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherDao.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherDao.kt index cde76ccd..27b9b869 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherDao.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeacherDao.kt @@ -1,39 +1,39 @@ -package pl.szczodrzynski.edziennik.data.db.modules.teachers; +package pl.szczodrzynski.edziennik.data.db.dao -import androidx.lifecycle.LiveData; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; - -import java.util.List; +import androidx.lifecycle.LiveData +import androidx.room.* +import androidx.sqlite.db.SupportSQLiteQuery +import pl.szczodrzynski.edziennik.data.db.entity.Teacher @Dao -public interface TeacherDao { +interface TeacherDao { @Insert(onConflict = OnConflictStrategy.REPLACE) - void add(Teacher teacher); + fun add(teacher: Teacher) @Insert(onConflict = OnConflictStrategy.REPLACE) - void addAll(List teacherList); + fun addAll(teacherList: List) @Insert(onConflict = OnConflictStrategy.IGNORE) - void addAllIgnore(List teacherList); + fun addAllIgnore(teacherList: List) + + @RawQuery + fun query(query: SupportSQLiteQuery): Int @Query("DELETE FROM teachers WHERE profileId = :profileId") - void clear(int profileId); + fun clear(profileId: Int) @Query("SELECT * FROM teachers WHERE profileId = :profileId AND teacherId = :id") - LiveData getById(int profileId, long id); + fun getById(profileId: Int, id: Long): LiveData @Query("SELECT * FROM teachers WHERE profileId = :profileId AND teacherId = :id") - Teacher getByIdNow(int profileId, long id); + fun getByIdNow(profileId: Int, id: Long): Teacher? @Query("SELECT * FROM teachers WHERE profileId = :profileId AND teacherType <= 127 ORDER BY teacherName, teacherSurname ASC") - LiveData> getAllTeachers(int profileId); + fun getAllTeachers(profileId: Int): LiveData> @Query("SELECT * FROM teachers WHERE profileId = :profileId ORDER BY teacherName, teacherSurname ASC") - List getAllNow(int profileId); + fun getAllNow(profileId: Int): List @Query("UPDATE teachers SET teacherLoginId = :loginId WHERE profileId = :profileId AND teacherId = :id") - void updateLoginId(int profileId, long id, String loginId); + fun updateLoginId(profileId: Int, id: Long, loginId: String?) } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teams/TeamDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeamDao.java similarity index 92% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teams/TeamDao.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeamDao.java index 717ed916..ca193707 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teams/TeamDao.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TeamDao.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.teams; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.dao; import androidx.lifecycle.LiveData; import androidx.room.Dao; @@ -8,6 +12,8 @@ import androidx.room.Query; import java.util.List; +import pl.szczodrzynski.edziennik.data.db.entity.Team; + @Dao public abstract class TeamDao { @Insert(onConflict = OnConflictStrategy.REPLACE) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt new file mode 100644 index 00000000..8ce9ed9b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableDao.kt @@ -0,0 +1,118 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.Dao +import androidx.room.Query +import androidx.room.RawQuery +import androidx.sqlite.db.SupportSQLiteQuery +import eu.szkolny.selectivedao.annotation.SelectiveDao +import eu.szkolny.selectivedao.annotation.UpdateSelective +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.data.db.AppDb +import pl.szczodrzynski.edziennik.data.db.entity.Lesson +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.data.db.full.LessonFull +import pl.szczodrzynski.edziennik.utils.models.Date + +@Dao +@SelectiveDao(db = AppDb::class) +abstract class TimetableDao : BaseDao { + companion object { + private const val QUERY = """ + SELECT + timetable.*, + subjects.subjectLongName AS subjectName, + teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName, + teams.teamName AS teamName, + oldS.subjectLongName AS oldSubjectName, + oldT.teacherName ||" "|| oldT.teacherSurname AS oldTeacherName, + oldG.teamName AS oldTeamName, + metadata.seen, metadata.notified + FROM timetable + LEFT JOIN subjects USING(profileId, subjectId) + LEFT JOIN teachers USING(profileId, teacherId) + LEFT JOIN teams USING(profileId, teamId) + LEFT JOIN subjects AS oldS ON timetable.profileId = oldS.profileId AND timetable.oldSubjectId = oldS.subjectId + LEFT JOIN teachers AS oldT ON timetable.profileId = oldT.profileId AND timetable.oldTeacherId = oldT.teacherId + LEFT JOIN teams AS oldG ON timetable.profileId = oldG.profileId AND timetable.oldTeamId = oldG.teamId + LEFT JOIN metadata ON id = thingId AND thingType = ${Metadata.TYPE_LESSON_CHANGE} AND metadata.profileId = timetable.profileId + """ + + private const val ORDER_BY = """ORDER BY profileId, id, type""" + private const val IS_CHANGED = """type != -1 AND type != 0""" + } + + private val selective by lazy { TimetableDaoSelective(App.db) } + + @RawQuery(observedEntities = [Lesson::class]) + abstract override fun getRaw(query: SupportSQLiteQuery): LiveData> + @RawQuery(observedEntities = [Lesson::class]) + abstract override fun getOne(query: SupportSQLiteQuery): LiveData + + // SELECTIVE UPDATE + @UpdateSelective(primaryKeys = ["profileId", "id"], skippedColumns = ["addedDate"]) + override fun update(item: Lesson) = selective.update(item) + override fun updateAll(items: List) = selective.updateAll(items) + + // CLEAR + @Query("DELETE FROM timetable WHERE profileId = :profileId") + abstract override fun clear(profileId: Int) + // REMOVE NOT KEPT + @Query("DELETE FROM timetable WHERE keep = 0") + abstract override fun removeNotKept() + + // GET ALL - LIVE DATA + fun getAll(profileId: Int) = + getRaw("$QUERY WHERE timetable.profileId = $profileId $ORDER_BY") + fun getAllForDate(profileId: Int, date: Date) = + getRaw("$QUERY WHERE timetable.profileId = $profileId AND ((type != 3 AND date = '${date.stringY_m_d}') OR ((type = 3 OR type = 1) AND oldDate = '${date.stringY_m_d}')) $ORDER_BY") + fun getNextWithSubject(profileId: Int, date: Date, subjectId: Long) = + getOne("$QUERY " + + "WHERE timetable.profileId = $profileId " + + "AND ((type != 3 AND date > '${date.stringY_m_d}') OR ((type = 3 OR type = 1) AND oldDate > '${date.stringY_m_d}')) " + + "AND timetable.subjectId = $subjectId " + + "LIMIT 1") + fun getNextWithSubjectAndTeam(profileId: Int, date: Date, subjectId: Long, teamId: Long) = + getOne("$QUERY " + + "WHERE timetable.profileId = $profileId " + + "AND ((type != 3 AND date > '${date.stringY_m_d}') OR ((type = 3 OR type = 1) AND oldDate > '${date.stringY_m_d}')) " + + "AND timetable.subjectId = $subjectId " + + "AND timetable.teamId = $teamId " + + "LIMIT 1") + fun getBetweenDates(dateFrom: Date, dateTo: Date) = + getRaw("$QUERY WHERE (type != 3 AND date >= '${dateFrom.stringY_m_d}' AND date <= '${dateTo.stringY_m_d}') OR ((type = 3 OR type = 1) AND oldDate >= '${dateFrom.stringY_m_d}' AND oldDate <= '${dateTo.stringY_m_d}') $ORDER_BY") + fun getChanges(profileId: Int) = + getRaw("$QUERY WHERE timetable.profileId = $profileId AND $IS_CHANGED $ORDER_BY") + + // GET ALL - NOW + fun getAllNow(profileId: Int) = + getRawNow("$QUERY WHERE timetable.profileId = $profileId $ORDER_BY") + fun getNotNotifiedNow() = + getRawNow("$QUERY WHERE notified = 0 AND timetable.type NOT IN (${Lesson.TYPE_NORMAL}, ${Lesson.TYPE_NO_LESSONS}, ${Lesson.TYPE_SHIFTED_SOURCE}) $ORDER_BY") + fun getNotNotifiedNow(profileId: Int) = + getRawNow("$QUERY WHERE timetable.profileId = $profileId AND notified = 0 AND timetable.type NOT IN (${Lesson.TYPE_NORMAL}, ${Lesson.TYPE_NO_LESSONS}, ${Lesson.TYPE_SHIFTED_SOURCE}) $ORDER_BY") + fun getAllForDateNow(profileId: Int, date: Date) = + getRawNow("$QUERY WHERE timetable.profileId = $profileId AND ((type != 3 AND date = '${date.stringY_m_d}') OR ((type = 3 OR type = 1) AND oldDate = '${date.stringY_m_d}')) $ORDER_BY") + fun getChangesNow(profileId: Int) = + getRawNow("$QUERY WHERE timetable.profileId = $profileId AND $IS_CHANGED $ORDER_BY") + fun getChangesForDateNow(profileId: Int, date: Date) = + getRawNow("$QUERY WHERE timetable.profileId = $profileId AND $IS_CHANGED AND ((type != 3 AND date = '${date.stringY_m_d}') OR ((type = 3 OR type = 1) AND oldDate = '${date.stringY_m_d}')) $ORDER_BY") + fun getBetweenDatesNow(dateFrom: Date, dateTo: Date) = + getRawNow("$QUERY WHERE (type != 3 AND date >= '${dateFrom.stringY_m_d}' AND date <= '${dateTo.stringY_m_d}') OR ((type = 3 OR type = 1) AND oldDate >= '${dateFrom.stringY_m_d}' AND oldDate <= '${dateTo.stringY_m_d}') $ORDER_BY") + + // GET ONE - NOW + fun getByIdNow(profileId: Int, id: Long) = + getOneNow("$QUERY WHERE timetable.profileId = $profileId AND timetable.id = $id") + + @Query("UPDATE timetable SET keep = 0 WHERE profileId = :profileId AND type != -1 AND ((type != 3 AND date >= :dateFrom) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom))") + abstract fun dontKeepFromDate(profileId: Int, dateFrom: Date) + + @Query("UPDATE timetable SET keep = 0 WHERE profileId = :profileId AND type != -1 AND ((type != 3 AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate <= :dateTo))") + abstract fun dontKeepToDate(profileId: Int, dateTo: Date) + + @Query("UPDATE timetable SET keep = 0 WHERE profileId = :profileId AND type != -1 AND ((type != 3 AND date >= :dateFrom AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom AND oldDate <= :dateTo))") + abstract fun dontKeepBetweenDates(profileId: Int, dateFrom: Date, dateTo: Date) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableManualDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableManualDao.kt new file mode 100644 index 00000000..fba4d226 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/dao/TimetableManualDao.kt @@ -0,0 +1,34 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-2-22. + */ + +package pl.szczodrzynski.edziennik.data.db.dao + +import androidx.lifecycle.LiveData +import androidx.room.* +import pl.szczodrzynski.edziennik.data.db.entity.TimetableManual +import pl.szczodrzynski.edziennik.utils.models.Date + +@Dao +interface TimetableManualDao { + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun add(timetableManual: TimetableManual) + + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun addAll(timetableManualList: List) + + @Query("SELECT * FROM timetableManual WHERE profileId = :profileId") + fun getAll(profileId: Int): LiveData> + + @Query("SELECT * FROM timetableManual WHERE profileId = :profileId AND date >= :dateFrom AND date <= :dateTo") + fun getAllByDateRange(profileId: Int, dateFrom: Date, dateTo: Date): LiveData> + + @Query("SELECT * FROM timetableManual WHERE profileId = :profileId AND (date IS NULL OR date = 0 OR date >= :dateFrom)") + fun getAllToDisplay(profileId: Int, dateFrom: Date): LiveData> + + @Delete + fun delete(timetableManual: TimetableManual) + + @Query("DELETE FROM timetableManual WHERE profileId = :profileId") + fun clear(profileId: Int) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Announcement.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Announcement.kt new file mode 100644 index 00000000..82f7bb78 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Announcement.kt @@ -0,0 +1,40 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-24. + */ +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Ignore +import androidx.room.Index +import pl.szczodrzynski.edziennik.utils.models.Date + +@Entity(tableName = "announcements", + primaryKeys = ["profileId", "announcementId"], + indices = [ + Index(value = ["profileId"]) + ]) +open class Announcement( + val profileId: Int, + @ColumnInfo(name = "announcementId") + var id: Long, + @ColumnInfo(name = "announcementSubject") + var subject: String, + @ColumnInfo(name = "announcementText") + var text: String?, + + @ColumnInfo(name = "announcementStartDate") + var startDate: Date?, + @ColumnInfo(name = "announcementEndDate") + var endDate: Date?, + + var teacherId: Long, + var addedDate: Long = System.currentTimeMillis() +) : Keepable() { + + @ColumnInfo(name = "announcementIdString") + var idString: String? = null + + @Ignore + var showAsUnseen: Boolean? = null +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Attendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Attendance.kt new file mode 100644 index 00000000..b2ebb5a0 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Attendance.kt @@ -0,0 +1,78 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-24. + */ +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Ignore +import androidx.room.Index +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time + +@Entity(tableName = "attendances", + primaryKeys = ["profileId", "attendanceId"], + indices = [ + Index(value = ["profileId"]) + ]) +open class Attendance( + val profileId: Int, + @ColumnInfo(name = "attendanceId") + var id: Long, + /** Base type ID used to count attendance stats */ + @ColumnInfo(name = "attendanceBaseType") + var baseType: Int, + /** A full type name coming from the e-register */ + @ColumnInfo(name = "attendanceTypeName") + var typeName: String, + /** A short name to display by default, might be different for non-standard types */ + @ColumnInfo(name = "attendanceTypeShort") + val typeShort: String, + /** A short name that the e-register would display */ + @ColumnInfo(name = "attendanceTypeSymbol") + var typeSymbol: String, + /** A color that the e-register would display, null falls back to app's default */ + @ColumnInfo(name = "attendanceTypeColor") + var typeColor: Int?, + + @ColumnInfo(name = "attendanceDate") + var date: Date, + @ColumnInfo(name = "attendanceTime") + var startTime: Time?, + @ColumnInfo(name = "attendanceSemester") + var semester: Int, + + var teacherId: Long, + var subjectId: Long, + var addedDate: Long = System.currentTimeMillis() +) : Keepable() { + companion object { + const val TYPE_UNKNOWN = -1 // #3f51b5 + const val TYPE_PRESENT = 0 // #009688 + const val TYPE_PRESENT_CUSTOM = 10 // count as presence AND show in the list + custom color, fallback: #3f51b5 + const val TYPE_ABSENT = 1 // #ff3d00 + const val TYPE_ABSENT_EXCUSED = 2 // #76ff03 + const val TYPE_RELEASED = 3 // #9e9e9e + const val TYPE_BELATED = 4 // #ffc107 + const val TYPE_BELATED_EXCUSED = 5 // #ffc107 + const val TYPE_DAY_FREE = 6 // #43a047 + + // attendance bar order: + // day_free, present, present_custom, unknown, belated_excused, belated, released, absent_excused, absent, + } + + @ColumnInfo(name = "attendanceLessonTopic") + var lessonTopic: String? = null + @ColumnInfo(name = "attendanceLessonNumber") + var lessonNumber: Int? = null + @ColumnInfo(name = "attendanceIsCounted") + var isCounted: Boolean = true + + @Ignore + var showAsUnseen: Boolean? = null + + @delegate:Ignore + val typeObject by lazy { + AttendanceType(profileId, baseType.toLong(), baseType, typeName, typeShort, typeSymbol, typeColor).also { it.isCounted = isCounted } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/AttendanceType.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/AttendanceType.kt new file mode 100644 index 00000000..c5fccc4b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/AttendanceType.kt @@ -0,0 +1,59 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-10-23. + */ + +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.Entity +import androidx.room.Ignore + +@Entity(tableName = "attendanceTypes", + primaryKeys = ["profileId", "id"]) +data class AttendanceType ( + val profileId: Int, + val id: Long, + /** Base type ID used to count attendance stats */ + val baseType: Int, + /** A full type name coming from the e-register */ + val typeName: String, + /** A short name to display by default, might be different for non-standard types */ + val typeShort: String, + /** A short name that the e-register would display */ + val typeSymbol: String, + /** A color that the e-register would display, null falls back to app's default */ + val typeColor: Int? +) : Comparable { + + @Ignore + var isCounted: Boolean = true + + // attendance bar order: + // day_free, present, present_custom, unknown, belated_excused, belated, released, absent_excused, absent, + override fun compareTo(other: AttendanceType): Int { + val type1 = when (baseType) { + Attendance.TYPE_DAY_FREE -> 0 + Attendance.TYPE_PRESENT -> 1 + Attendance.TYPE_PRESENT_CUSTOM -> 2 + Attendance.TYPE_UNKNOWN -> 3 + Attendance.TYPE_BELATED_EXCUSED -> 4 + Attendance.TYPE_BELATED -> 5 + Attendance.TYPE_RELEASED -> 6 + Attendance.TYPE_ABSENT_EXCUSED -> 7 + Attendance.TYPE_ABSENT -> 8 + else -> 9 + } + val type2 = when (other.baseType) { + Attendance.TYPE_DAY_FREE -> 0 + Attendance.TYPE_PRESENT -> 1 + Attendance.TYPE_PRESENT_CUSTOM -> 2 + Attendance.TYPE_UNKNOWN -> 3 + Attendance.TYPE_BELATED_EXCUSED -> 4 + Attendance.TYPE_BELATED -> 5 + Attendance.TYPE_RELEASED -> 6 + Attendance.TYPE_ABSENT_EXCUSED -> 7 + Attendance.TYPE_ABSENT -> 8 + else -> 9 + } + return type1 - type2 + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/Classroom.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Classroom.kt similarity index 81% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/Classroom.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Classroom.kt index fc2fe404..410982e5 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/classrooms/Classroom.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Classroom.kt @@ -2,7 +2,7 @@ * Copyright (c) Kuba Szczodrzyński 2019-10-23. */ -package pl.szczodrzynski.edziennik.data.db.modules.classrooms +package pl.szczodrzynski.edziennik.data.db.entity import androidx.room.Entity diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/debuglog/DebugLog.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/DebugLog.java similarity index 77% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/debuglog/DebugLog.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/DebugLog.java index 866a3882..6fff3cce 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/debuglog/DebugLog.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/DebugLog.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.debuglog; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.entity; import androidx.room.Entity; import androidx.room.PrimaryKey; diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimer.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/EndpointTimer.kt similarity index 94% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimer.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/EndpointTimer.kt index 24344462..05676131 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/api/EndpointTimer.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/EndpointTimer.kt @@ -1,8 +1,8 @@ /* - * Copyright (c) Kuba Szczodrzyński 2019-10-3. + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 */ -package pl.szczodrzynski.edziennik.data.db.modules.api +package pl.szczodrzynski.edziennik.data.db.entity import androidx.room.ColumnInfo import androidx.room.Entity @@ -80,4 +80,4 @@ data class EndpointTimer ( viewId = null return this } -} \ No newline at end of file +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.kt new file mode 100644 index 00000000..3e59cc17 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Event.kt @@ -0,0 +1,128 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Ignore +import androidx.room.Index +import com.google.gson.annotations.SerializedName +import pl.szczodrzynski.edziennik.MINUTE +import pl.szczodrzynski.edziennik.data.db.full.EventFull +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time +import java.util.* + +@Entity(tableName = "events", + primaryKeys = ["profileId", "eventId"], + indices = [ + Index(value = ["profileId", "eventDate", "eventTime"]), + Index(value = ["profileId", "eventType"]) + ]) +open class Event( + /* This needs to be mutable: see SzkolnyApi.getEvents() */ + var profileId: Int, + @ColumnInfo(name = "eventId") + var id: Long, + @ColumnInfo(name = "eventDate") + @SerializedName("eventDate") + var date: Date, + @ColumnInfo(name = "eventTime") + @SerializedName("startTime") + var time: Time?, + + @ColumnInfo(name = "eventTopic") + var topic: String, + @ColumnInfo(name = "eventColor") + var color: Int?, + @ColumnInfo(name = "eventType") + var type: Long, + + var teacherId: Long, + var subjectId: Long, + var teamId: Long, + var addedDate: Long = System.currentTimeMillis() +) : Keepable() { + companion object { + const val TYPE_ELEARNING = -5L + const val TYPE_UNDEFINED = -2L + const val TYPE_HOMEWORK = -1L + const val TYPE_DEFAULT = 0L + const val TYPE_EXAM = 1L + const val TYPE_SHORT_QUIZ = 2L + const val TYPE_ESSAY = 3L + const val TYPE_PROJECT = 4L + const val TYPE_PT_MEETING = 5L + const val TYPE_EXCURSION = 6L + const val TYPE_READING = 7L + const val TYPE_CLASS_EVENT = 8L + const val TYPE_INFORMATION = 9L + const val COLOR_ELEARNING = 0xfff57f17.toInt() + const val COLOR_HOMEWORK = 0xff795548.toInt() + const val COLOR_DEFAULT = 0xffffc107.toInt() + const val COLOR_EXAM = 0xfff44336.toInt() + const val COLOR_SHORT_QUIZ = 0xff76ff03.toInt() + const val COLOR_ESSAY = 0xFF4050B5.toInt() + const val COLOR_PROJECT = 0xFF673AB7.toInt() + const val COLOR_PT_MEETING = 0xff90caf9.toInt() + const val COLOR_EXCURSION = 0xFF4CAF50.toInt() + const val COLOR_READING = 0xFFFFEB3B.toInt() + const val COLOR_CLASS_EVENT = 0xff388e3c.toInt() + const val COLOR_INFORMATION = 0xff039be5.toInt() + } + + @ColumnInfo(name = "eventAddedManually") + var addedManually: Boolean = false + @ColumnInfo(name = "eventSharedBy") + var sharedBy: String? = null + @ColumnInfo(name = "eventSharedByName") + var sharedByName: String? = null + @ColumnInfo(name = "eventBlacklisted") + var blacklisted: Boolean = false + @ColumnInfo(name = "eventIsDone") + var isDone: Boolean = false + + /** + * Body/text of the event, if this is a [TYPE_HOMEWORK]. + * May be null if the body is not downloaded yet, or the type is not [TYPE_HOMEWORK]. + * May be empty or blank if the homework has no specific body attached, + * or the topic contains the body already. + */ + var homeworkBody: String? = null + var attachmentIds: MutableList? = null + var attachmentNames: MutableList? = null + + /** + * Add an attachment + * @param id attachment ID + * @param name file name incl. extension + * @return a Event to which the attachment has been added + */ + fun addAttachment(id: Long, name: String): Event { + if (attachmentIds == null) attachmentIds = mutableListOf() + if (attachmentNames == null) attachmentNames = mutableListOf() + attachmentIds?.add(id) + attachmentNames?.add(name) + return this + } + + fun clearAttachments() { + attachmentIds = null + attachmentNames = null + } + + @Ignore + var showAsUnseen: Boolean? = null + + val startTimeCalendar: Calendar + get() = date.getAsCalendar(time) + + val endTimeCalendar: Calendar + get() = startTimeCalendar.also { + it.timeInMillis += 45 * MINUTE * 1000 + } + + @Ignore + fun withMetadata(metadata: Metadata) = EventFull(this, metadata) +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/EventType.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/EventType.kt new file mode 100644 index 00000000..7753b38a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/EventType.kt @@ -0,0 +1,89 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-19. + */ +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_CLASS_EVENT +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_DEFAULT +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_ELEARNING +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_ESSAY +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_EXAM +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_EXCURSION +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_HOMEWORK +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_INFORMATION +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_PROJECT +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_PT_MEETING +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_READING +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_SHORT_QUIZ +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_CLASS_EVENT +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_DEFAULT +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_ELEARNING +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_ESSAY +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_EXAM +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_EXCURSION +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_HOMEWORK +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_INFORMATION +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_PROJECT +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_PT_MEETING +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_READING +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_SHORT_QUIZ + +@Entity( + tableName = "eventTypes", + primaryKeys = ["profileId", "eventType"] +) +class EventType( + val profileId: Int, + + @ColumnInfo(name = "eventType") + val id: Long, + + @ColumnInfo(name = "eventTypeName") + val name: String, + @ColumnInfo(name = "eventTypeColor") + val color: Int, + @ColumnInfo(name = "eventTypeOrder") + var order: Int = id.toInt(), + @ColumnInfo(name = "eventTypeSource") + val source: Int = SOURCE_REGISTER +) { + companion object { + const val SOURCE_DEFAULT = 0 + const val SOURCE_REGISTER = 1 + const val SOURCE_CUSTOM = 2 + const val SOURCE_SHARED = 3 + + fun getTypeColorMap() = mapOf( + TYPE_ELEARNING to COLOR_ELEARNING, + TYPE_HOMEWORK to COLOR_HOMEWORK, + TYPE_DEFAULT to COLOR_DEFAULT, + TYPE_EXAM to COLOR_EXAM, + TYPE_SHORT_QUIZ to COLOR_SHORT_QUIZ, + TYPE_ESSAY to COLOR_ESSAY, + TYPE_PROJECT to COLOR_PROJECT, + TYPE_PT_MEETING to COLOR_PT_MEETING, + TYPE_EXCURSION to COLOR_EXCURSION, + TYPE_READING to COLOR_READING, + TYPE_CLASS_EVENT to COLOR_CLASS_EVENT, + TYPE_INFORMATION to COLOR_INFORMATION + ) + + fun getTypeNameMap() = mapOf( + TYPE_ELEARNING to R.string.event_type_elearning, + TYPE_HOMEWORK to R.string.event_type_homework, + TYPE_DEFAULT to R.string.event_other, + TYPE_EXAM to R.string.event_exam, + TYPE_SHORT_QUIZ to R.string.event_short_quiz, + TYPE_ESSAY to R.string.event_essay, + TYPE_PROJECT to R.string.event_project, + TYPE_PT_MEETING to R.string.event_pt_meeting, + TYPE_EXCURSION to R.string.event_excursion, + TYPE_READING to R.string.event_reading, + TYPE_CLASS_EVENT to R.string.event_class_event, + TYPE_INFORMATION to R.string.event_information + ) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/FeedbackMessage.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/FeedbackMessage.kt new file mode 100644 index 00000000..8ceb41f7 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/FeedbackMessage.kt @@ -0,0 +1,33 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-21. + */ + +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "feedbackMessages") +open class FeedbackMessage( + @PrimaryKey(autoGenerate = true) + val messageId: Int = 0, + + val received: Boolean, + val text: String, + + // used always - contains the sender name + val senderName: String, + + // used in DEV apps - contains device ID and model + var deviceId: String? = null, + var deviceName: String? = null, + + val devId: Int? = null, + val devImage: String? = null, + + val sentTime: Long = System.currentTimeMillis() +) { + class WithCount(messageId: Int, received: Boolean, text: String, senderName: String, deviceId: String?, deviceName: String?, devId: Int?, devImage: String?, sentTime: Long) : FeedbackMessage(messageId, received, text, senderName, deviceId, deviceName, devId, devImage, sentTime) { + var count = 0 + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Grade.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Grade.kt new file mode 100644 index 00000000..5bf3bd86 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Grade.kt @@ -0,0 +1,82 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-24. + */ +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Ignore +import androidx.room.Index + +@Entity(tableName = "grades", + primaryKeys = ["profileId", "gradeId"], + indices = [ + Index(value = ["profileId"]) + ]) +open class Grade( + val profileId: Int, + @ColumnInfo(name = "gradeId") + val id: Long, + @ColumnInfo(name = "gradeName") + var name: String, + @ColumnInfo(name = "gradeType") + var type: Int, + + @ColumnInfo(name = "gradeValue") + var value: Float, + @ColumnInfo(name = "gradeWeight") + var weight: Float, + @ColumnInfo(name = "gradeColor") + var color: Int, + + @ColumnInfo(name = "gradeCategory") + var category: String?, + @ColumnInfo(name = "gradeDescription") + var description: String?, + @ColumnInfo(name = "gradeComment") + var comment: String?, + + @ColumnInfo(name = "gradeSemester") + val semester: Int, + val teacherId: Long, + val subjectId: Long, + var addedDate: Long = System.currentTimeMillis() +) : Keepable() { + companion object { + const val TYPE_NORMAL = 0 + const val TYPE_SEMESTER1_PROPOSED = 1 + const val TYPE_SEMESTER1_FINAL = 2 + const val TYPE_SEMESTER2_PROPOSED = 3 + const val TYPE_SEMESTER2_FINAL = 4 + const val TYPE_YEAR_PROPOSED = 5 + const val TYPE_YEAR_FINAL = 6 + const val TYPE_POINT_AVG = 10 + const val TYPE_POINT_SUM = 20 + const val TYPE_DESCRIPTIVE = 30 + const val TYPE_DESCRIPTIVE_TEXT = 31 + const val TYPE_TEXT = 40 + } + + @ColumnInfo(name = "gradeValueMax") + var valueMax: Float? = null + @ColumnInfo(name = "gradeClassAverage") + var classAverage: Float? = null + + /** + * Applies for historical grades. It's the new/replacement grade's ID. + */ + @ColumnInfo(name = "gradeParentId") + var parentId: Long? = null + /** + * Applies for current grades. If the grade was worse and this is the improved one. + */ + @ColumnInfo(name = "gradeIsImprovement") + var isImprovement = false + + @Ignore + var showAsUnseen = false + + val isImproved + get() = parentId ?: -1L != -1L +} + diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeCategory.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/GradeCategory.java similarity index 87% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeCategory.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/GradeCategory.java index 076a952a..287462fc 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeCategory.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/GradeCategory.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.grades; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.entity; import androidx.room.Entity; @@ -29,6 +33,9 @@ public class GradeCategory { public static final int TYPE_NORMAL_COMMENT = 1; public static final int TYPE_BEHAVIOUR = 2; public static final int TYPE_BEHAVIOUR_COMMENT = 3; + public static final int TYPE_DESCRIPTIVE = 4; + public static final int TYPE_TEXT = 5; + public static final int TYPE_POINT = 6; public GradeCategory(int profileId, long categoryId, float weight, int color, String text) { this.profileId = profileId; diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Keepable.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Keepable.kt new file mode 100644 index 00000000..eb0da986 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Keepable.kt @@ -0,0 +1,9 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-3-30. + */ + +package pl.szczodrzynski.edziennik.data.db.entity + +abstract class Keepable { + var keep: Boolean = true +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/Lesson.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Lesson.kt similarity index 94% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/Lesson.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Lesson.kt index 5cdac97e..0c97ba24 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/Lesson.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Lesson.kt @@ -1,21 +1,24 @@ /* - * Copyright (c) Kuba Szczodrzyński 2019-10-25. + * Copyright (c) Kuba Szczodrzyński 2020-4-25. */ - -package pl.szczodrzynski.edziennik.data.db.modules.timetable +package pl.szczodrzynski.edziennik.data.db.entity import androidx.room.Entity +import androidx.room.Ignore import androidx.room.Index -import androidx.room.PrimaryKey import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Time @Entity(tableName = "timetable", + primaryKeys = ["profileId", "id"], indices = [ Index(value = ["profileId", "type", "date"]), Index(value = ["profileId", "type", "oldDate"]) ]) -open class Lesson(val profileId: Int, @PrimaryKey var id: Long) { +open class Lesson( + val profileId: Int, + var id: Long +) : Keepable() { companion object { const val TYPE_NO_LESSONS = -1 const val TYPE_NORMAL = 0 @@ -66,6 +69,9 @@ open class Lesson(val profileId: Int, @PrimaryKey var id: Long) { fun buildId(): Long = (displayDate?.combineWith(displayStartTime) ?: 0L) / 6L * 10L + (hashCode() and 0xFFFF) + @Ignore + var showAsUnseen = false + override fun toString(): String { return "Lesson(profileId=$profileId, " + "id=$id, " + @@ -136,4 +142,4 @@ open class Lesson(val profileId: Int, @PrimaryKey var id: Long) { result = 31 * result + (oldClassroom?.hashCode() ?: 0) return result } -} \ No newline at end of file +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRange.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LessonRange.kt similarity index 90% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRange.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LessonRange.kt index 61c8c814..409a38e9 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonRange.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LessonRange.kt @@ -2,7 +2,7 @@ * Copyright (c) Kuba Szczodrzyński 2019-10-4. */ -package pl.szczodrzynski.edziennik.data.db.modules.lessons +package pl.szczodrzynski.edziennik.data.db.entity import androidx.room.ColumnInfo import androidx.room.Entity @@ -22,4 +22,4 @@ class LessonRange ( @ColumnInfo(name = "lessonRangeEnd") val endTime: Time -) \ No newline at end of file +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LibrusLesson.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LibrusLesson.kt new file mode 100644 index 00000000..e7e012a7 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LibrusLesson.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-5. + */ + +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.Entity +import androidx.room.Index + +@Entity(tableName = "librusLessons", + primaryKeys = ["profileId", "lessonId"], + indices = [Index("profileId")]) +data class LibrusLesson( + val profileId: Int, + val lessonId: Long, + val teacherId: Long, + val subjectId: Long, + val teamId: Long? = null +) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LoginStore.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LoginStore.kt new file mode 100644 index 00000000..192bd1f6 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LoginStore.kt @@ -0,0 +1,95 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.entity + +import android.os.Bundle +import androidx.room.ColumnInfo +import androidx.room.Entity +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.* + +@Entity(tableName = "loginStores", primaryKeys = ["loginStoreId"]) +class LoginStore( + @ColumnInfo(name = "loginStoreId") + val id: Int, + + @ColumnInfo(name = "loginStoreType") + val type: Int, + + @ColumnInfo(name = "loginStoreMode") + val mode: Int, + + @ColumnInfo(name = "loginStoreData") + val data: JsonObject = JsonObject() +) { + companion object { + const val LOGIN_TYPE_MOBIDZIENNIK = 1 + const val LOGIN_TYPE_LIBRUS = 2 + const val LOGIN_TYPE_VULCAN = 4 + const val LOGIN_TYPE_IDZIENNIK = 3 + const val LOGIN_TYPE_EDUDZIENNIK = 5 + const val LOGIN_TYPE_DEMO = 20 + const val LOGIN_MODE_LIBRUS_EMAIL = 0 + const val LOGIN_MODE_LIBRUS_SYNERGIA = 1 + const val LOGIN_MODE_LIBRUS_JST = 2 + } + + fun hasLoginData(key: String) = data.has(key) + fun getLoginData(key: String, defaultValue: Boolean) = data.getBoolean(key) ?: defaultValue + fun getLoginData(key: String, defaultValue: String?) = data.getString(key) ?: defaultValue + fun getLoginData(key: String, defaultValue: Int) = data.getInt(key) ?: defaultValue + fun getLoginData(key: String, defaultValue: Long) = data.getLong(key) ?: defaultValue + fun getLoginData(key: String, defaultValue: Float) = data.getFloat(key) ?: defaultValue + fun getLoginData(key: String, defaultValue: Char) = data.getChar(key) ?: defaultValue + fun getLoginData(key: String, defaultValue: JsonObject) = data.getJsonObject(key) ?: defaultValue + fun putLoginData(key: String, value: Boolean) { data[key] = value } + fun putLoginData(key: String, value: String?) { data[key] = value } + fun putLoginData(key: String, value: Number) { data[key] = value } + fun putLoginData(key: String, value: Char) { data[key] = value } + fun putLoginData(key: String, value: JsonObject) { data[key] = value } + fun removeLoginData(key: String) { data.remove(key) } + + fun copyFrom(args: Bundle) { + for (key in args.keySet()) { + when (val o = args[key]) { + is String -> putLoginData(key, o) + is Int -> putLoginData(key, o) + is Long -> putLoginData(key, o) + is Float -> putLoginData(key, o) + is Boolean -> putLoginData(key, o) + is Bundle -> putLoginData(key, o.toJsonObject()) + } + } + } + + fun type(): String { + return when (type) { + LOGIN_TYPE_MOBIDZIENNIK -> "LOGIN_TYPE_MOBIDZIENNIK" + LOGIN_TYPE_LIBRUS -> "LOGIN_TYPE_LIBRUS" + LOGIN_TYPE_IDZIENNIK -> "LOGIN_TYPE_IDZIENNIK" + LOGIN_TYPE_VULCAN -> "LOGIN_TYPE_VULCAN" + LOGIN_TYPE_DEMO -> "LOGIN_TYPE_DEMO" + else -> "unknown" + } + } + + fun mode(): String { + return when (mode) { + LOGIN_MODE_LIBRUS_EMAIL -> "LOGIN_MODE_LIBRUS_EMAIL" + LOGIN_MODE_LIBRUS_SYNERGIA -> "LOGIN_MODE_LIBRUS_SYNERGIA" + LOGIN_MODE_LIBRUS_JST -> "LOGIN_MODE_LIBRUS_JST" + else -> "unknown" + } + } + + override fun toString(): String { + return "LoginStore{" + + "id=" + id + + ", type=" + type() + + ", mode=" + mode() + + ", data=" + data + + '}' + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LuckyNumber.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LuckyNumber.kt new file mode 100644 index 00000000..6fb943c9 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/LuckyNumber.kt @@ -0,0 +1,22 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-24. + */ +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Ignore +import pl.szczodrzynski.edziennik.utils.models.Date + +@Entity(tableName = "luckyNumbers", + primaryKeys = ["profileId", "luckyNumberDate"]) +open class LuckyNumber( + val profileId: Int, + @ColumnInfo(name = "luckyNumberDate", typeAffinity = ColumnInfo.INTEGER) + var date: Date, + @ColumnInfo(name = "luckyNumber") + var number: Int +) : Keepable() { + @Ignore + var showAsUnseen = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Message.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Message.kt new file mode 100644 index 00000000..98105057 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Message.kt @@ -0,0 +1,77 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Ignore +import androidx.room.Index +import pl.szczodrzynski.edziennik.isNotNullNorEmpty + +@Entity(tableName = "messages", + primaryKeys = ["profileId", "messageId"], + indices = [ + Index(value = ["profileId", "messageType"]) + ]) +open class Message( + val profileId: Int, + @ColumnInfo(name = "messageId") + val id: Long, + @ColumnInfo(name = "messageType") + var type: Int, + + @ColumnInfo(name = "messageSubject") + var subject: String, + @ColumnInfo(name = "messageBody") + var body: String?, + + /** + * Keep in mind that this being null does NOT + * necessarily mean the message is sent. + */ + var senderId: Long?, + var addedDate: Long = System.currentTimeMillis() +) : Keepable() { + companion object { + const val TYPE_RECEIVED = 0 + const val TYPE_SENT = 1 + const val TYPE_DELETED = 2 + const val TYPE_DRAFT = 3 + } + + @ColumnInfo(name = "messageIsPinned") + var isPinned: Boolean = false + + var hasAttachments = false // if the attachments are not yet downloaded but we already know there are some + get() = field || attachmentIds.isNotNullNorEmpty() + var attachmentIds: MutableList? = null + var attachmentNames: MutableList? = null + var attachmentSizes: MutableList? = null + + @Ignore + var showAsUnseen: Boolean? = null + + /** + * Add an attachment + * @param id attachment ID + * @param name file name incl. extension + * @param size file size or -1 if unknown + * @return a Message to which the attachment has been added + */ + fun addAttachment(id: Long, name: String, size: Long): Message { + if (attachmentIds == null) attachmentIds = mutableListOf() + if (attachmentNames == null) attachmentNames = mutableListOf() + if (attachmentSizes == null) attachmentSizes = mutableListOf() + attachmentIds?.add(id) + attachmentNames?.add(name) + attachmentSizes?.add(size) + return this + } + + fun clearAttachments() { + attachmentIds = null + attachmentNames = null + attachmentSizes = null + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageRecipient.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/MessageRecipient.java similarity index 85% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageRecipient.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/MessageRecipient.java index 29635e5a..800af493 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageRecipient.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/MessageRecipient.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.messages; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.entity; import androidx.room.ColumnInfo; import androidx.room.Entity; @@ -14,8 +18,9 @@ public class MessageRecipient { @ColumnInfo(name = "messageRecipientReplyId") public long replyId = -1; /** - * -1 for not read - * 0 for read, date unknown + * -1 for unknown + * 0 for not read + * 1 for read, date unknown * time in millis for read, date known */ @ColumnInfo(name = "messageRecipientReadDate") diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/metadata/Metadata.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Metadata.java similarity index 91% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/metadata/Metadata.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Metadata.java index 78dac639..7374d915 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/metadata/Metadata.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Metadata.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.metadata; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.entity; import androidx.room.ColumnInfo; import androidx.room.Entity; @@ -32,7 +36,6 @@ public class Metadata { public boolean seen; public boolean notified; - public long addedDate; @Ignore public Metadata() { @@ -41,13 +44,12 @@ public class Metadata { this.notified = false; } - public Metadata(int profileId, int thingType, long thingId, boolean seen, boolean notified, long addedDate) { + public Metadata(int profileId, int thingType, long thingId, boolean seen, boolean notified) { this.profileId = profileId; this.thingType = thingType; this.thingId = thingId; this.seen = seen; this.notified = notified; - this.addedDate = addedDate; } public String thingType() { @@ -82,7 +84,6 @@ public class Metadata { ", thingId=" + thingId + ", seen=" + seen + ", notified=" + notified + - ", addedDate=" + addedDate + '}'; } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notice.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notice.kt new file mode 100644 index 00000000..0e1f21fe --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notice.kt @@ -0,0 +1,43 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Ignore +import androidx.room.Index + +@Entity(tableName = "notices", + primaryKeys = ["profileId", "noticeId"], + indices = [ + Index(value = ["profileId"]) + ]) +open class Notice( + val profileId: Int, + @ColumnInfo(name = "noticeId") + var id: Long, + @ColumnInfo(name = "noticeType") + var type: Int, + @ColumnInfo(name = "noticeSemester") + var semester: Int, + + @ColumnInfo(name = "noticeText") + var text: String, + @ColumnInfo(name = "noticeCategory") + var category: String?, + @ColumnInfo(name = "noticePoints") + var points: Float?, + + var teacherId: Long, + var addedDate: Long = System.currentTimeMillis() +) : Keepable() { + companion object { + const val TYPE_NEUTRAL = 0 + const val TYPE_POSITIVE = 1 + const val TYPE_NEGATIVE = 2 + } + + @Ignore + var showAsUnseen = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeType.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/NoticeType.kt similarity index 82% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeType.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/NoticeType.kt index a9112fbb..fbfa42ad 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeType.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/NoticeType.kt @@ -2,7 +2,7 @@ * Copyright (c) Kuba Szczodrzyński 2019-10-23. */ -package pl.szczodrzynski.edziennik.data.db.modules.notices +package pl.szczodrzynski.edziennik.data.db.entity import androidx.room.Entity diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notification.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notification.kt new file mode 100644 index 00000000..0a049216 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Notification.kt @@ -0,0 +1,117 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.entity + +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import androidx.room.Entity +import androidx.room.PrimaryKey +import com.google.gson.JsonObject +import com.mikepenz.iconics.typeface.IIcon +import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial +import pl.szczodrzynski.edziennik.MainActivity + +@Entity(tableName = "notifications") +data class Notification( + @PrimaryKey(autoGenerate = true) + val id: Long = 0, + + val title: String, + val text: String, + val textLong: String? = null, + + val type: Int, + + val profileId: Int?, + val profileName: String?, + + var posted: Boolean = true, + + var viewId: Int? = null, + var extras: JsonObject? = null, + + val addedDate: Long = System.currentTimeMillis() +) { + companion object { + const val TYPE_GENERAL = 0 + const val TYPE_UPDATE = 1 + const val TYPE_ERROR = 2 + const val TYPE_TIMETABLE_CHANGED = 3 + const val TYPE_TIMETABLE_LESSON_CHANGE = 4 + const val TYPE_NEW_GRADE = 5 + const val TYPE_NEW_EVENT = 6 + const val TYPE_NEW_HOMEWORK = 10 + const val TYPE_NEW_SHARED_EVENT = 7 + const val TYPE_NEW_SHARED_HOMEWORK = 12 + const val TYPE_REMOVED_SHARED_EVENT = 18 + const val TYPE_NEW_MESSAGE = 8 + const val TYPE_NEW_NOTICE = 9 + const val TYPE_NEW_ATTENDANCE = 13 + const val TYPE_SERVER_MESSAGE = 11 + const val TYPE_LUCKY_NUMBER = 14 + const val TYPE_NEW_ANNOUNCEMENT = 15 + const val TYPE_FEEDBACK_MESSAGE = 16 + const val TYPE_AUTO_ARCHIVING = 17 + const val TYPE_TEACHER_ABSENCE = 19 + + fun buildId(profileId: Int, type: Int, itemId: Long): Long { + return 1000000000000 + profileId*10000000000 + type*100000000 + itemId; + } + } + + fun addExtra(key: String, value: Long?): Notification { + extras = extras ?: JsonObject() + extras?.addProperty(key, value) + return this + } + fun addExtra(key: String, value: String?): Notification { + extras = extras ?: JsonObject() + extras?.addProperty(key, value) + return this + } + + fun fillIntent(intent: Intent) { + if (profileId != -1) + intent.putExtra("profileId", profileId) + if (viewId != -1) + intent.putExtra("fragmentId", viewId) + try { + extras?.entrySet()?.forEach { (key, value) -> + if (!value.isJsonPrimitive) + return@forEach + val primitive = value.asJsonPrimitive + if (primitive.isNumber) { + intent.putExtra(key, primitive.asLong) + } else if (primitive.isString) { + intent.putExtra(key, primitive.asString) + } + } + } catch (e: NullPointerException) { + e.printStackTrace() + } + } + + fun getPendingIntent(context: Context): PendingIntent { + val intent = Intent(context, MainActivity::class.java) + fillIntent(intent) + return PendingIntent.getActivity(context, id.toInt(), intent, PendingIntent.FLAG_ONE_SHOT) + } + + fun getLargeIcon(): IIcon = when (type) { + TYPE_TIMETABLE_LESSON_CHANGE -> CommunityMaterial.Icon3.cmd_timetable + TYPE_NEW_GRADE -> CommunityMaterial.Icon3.cmd_numeric_5_box_outline + TYPE_NEW_EVENT -> CommunityMaterial.Icon.cmd_calendar_outline + TYPE_NEW_HOMEWORK -> CommunityMaterial.Icon3.cmd_notebook_outline + TYPE_NEW_SHARED_EVENT -> CommunityMaterial.Icon.cmd_calendar_outline + TYPE_NEW_SHARED_HOMEWORK -> CommunityMaterial.Icon3.cmd_notebook_outline + TYPE_NEW_MESSAGE -> CommunityMaterial.Icon.cmd_email_outline + TYPE_NEW_NOTICE -> CommunityMaterial.Icon.cmd_emoticon_outline + TYPE_NEW_ATTENDANCE -> CommunityMaterial.Icon.cmd_calendar_remove_outline + TYPE_LUCKY_NUMBER -> CommunityMaterial.Icon.cmd_emoticon_excited_outline + TYPE_NEW_ANNOUNCEMENT -> CommunityMaterial.Icon.cmd_bullhorn_outline + else -> CommunityMaterial.Icon.cmd_bell_ring_outline + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt new file mode 100644 index 00000000..9c2552a6 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Profile.kt @@ -0,0 +1,237 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.entity + +import android.content.Context +import android.graphics.PorterDuff +import android.graphics.PorterDuffColorFilter +import android.graphics.drawable.Drawable +import android.widget.ImageView +import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Ignore +import com.google.gson.JsonObject +import pl.droidsonroids.gif.GifDrawable +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.* +import pl.szczodrzynski.edziennik.utils.ProfileImageHolder +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.navlib.ImageHolder +import pl.szczodrzynski.navlib.R +import pl.szczodrzynski.navlib.drawer.IDrawerProfile +import pl.szczodrzynski.navlib.getDrawableFromRes + +@Entity(tableName = "profiles", primaryKeys = ["profileId"]) +open class Profile( + @ColumnInfo(name = "profileId") + override var id: Int, /* needs to be var for ProfileArchiver */ + val loginStoreId: Int, + val loginStoreType: Int, + + override var name: String = "", + override var subname: String? = null, + + /** + * The name of the student. + * This doesn't change, no matter if it's a parent or student account. + */ + var studentNameLong: String = "", + var studentNameShort: String = "", + /** + * A full name of the account owner. + * If null, then it's a student account. + * If not null, then it's a parent account with this name. + */ + var accountName: String? = null, + + val studentData: JsonObject = JsonObject() + +) : IDrawerProfile { + companion object { + const val REGISTRATION_UNSPECIFIED = 0 + const val REGISTRATION_DISABLED = 1 + const val REGISTRATION_ENABLED = 2 + const val AGENDA_DEFAULT = 0 + const val AGENDA_CALENDAR = 1 + } + + override var image: String? = null + + var empty = true + var archived = false + + /** + * A unique ID matching [archived] profiles with current ones + * and vice-versa. + */ + var archiveId: Int? = null + + var syncEnabled = true + var enableSharedEvents = true + var registration = REGISTRATION_UNSPECIFIED + var userCode = "" + + /** + * The student's number in the class register. + */ + var studentNumber = -1 + var studentClassName: String? = null + var studentSchoolYearStart = Date.getToday().let { if (it.month < 9) it.year - 1 else it.year } + + var dateSemester1Start = Date(studentSchoolYearStart, 9, 1) + var dateSemester2Start = Date(studentSchoolYearStart + 1, 2, 1) + var dateYearEnd = Date(studentSchoolYearStart + 1, 6, 30) + fun getSemesterStart(semester: Int) = if (semester == 1) dateSemester1Start else dateSemester2Start + fun getSemesterEnd(semester: Int) = if (semester == 1) dateSemester2Start.clone().stepForward(0, 0, -1) else dateYearEnd + fun dateToSemester(date: Date) = if (date >= dateSemester2Start) 2 else 1 + @delegate:Ignore + val currentSemester by lazy { dateToSemester(Date.getToday()) } + + fun shouldArchive(): Boolean { + // vulcan hotfix + if (dateYearEnd.month > 6) { + dateYearEnd.month = 6 + dateYearEnd.day = 30 + } + // fix for when versions <4.3 synced 2020/2021 year dates to older profiles during 2020 Jun-Aug + if (dateSemester1Start.year > studentSchoolYearStart) { + val diff = dateSemester1Start.year - studentSchoolYearStart + dateSemester1Start.year -= diff + dateSemester2Start.year -= diff + dateYearEnd.year -= diff + } + return App.config.archiverEnabled + && Date.getToday() >= dateYearEnd + && Date.getToday().year > studentSchoolYearStart + } + fun isBeforeYear() = false && Date.getToday() < dateSemester1Start + + var disabledNotifications: List? = null + + var lastReceiversSync: Long = 0 + + fun hasStudentData(key: String) = studentData.has(key) + fun getStudentData(key: String, defaultValue: Boolean) = studentData.getBoolean(key) ?: defaultValue + fun getStudentData(key: String, defaultValue: String?) = studentData.getString(key) ?: defaultValue + fun getStudentData(key: String, defaultValue: Int) = studentData.getInt(key) ?: defaultValue + fun getStudentData(key: String, defaultValue: Long) = studentData.getLong(key) ?: defaultValue + fun getStudentData(key: String, defaultValue: Float) = studentData.getFloat(key) ?: defaultValue + fun getStudentData(key: String, defaultValue: Char) = studentData.getChar(key) ?: defaultValue + fun putStudentData(key: String, value: Boolean) { studentData[key] = value } + fun putStudentData(key: String, value: String?) { studentData[key] = value } + fun putStudentData(key: String, value: Number) { studentData[key] = value } + fun putStudentData(key: String, value: Char) { studentData[key] = value } + fun removeStudentData(key: String) { studentData.remove(key) } + + val isParent + get() = accountName != null + + val accountOwnerName + get() = accountName ?: studentNameLong + + val registerName + get() = when (loginStoreType) { + LOGIN_TYPE_LIBRUS -> "librus" + LOGIN_TYPE_VULCAN -> "vulcan" + LOGIN_TYPE_IDZIENNIK -> "idziennik" + LOGIN_TYPE_MOBIDZIENNIK -> "mobidziennik" + LOGIN_TYPE_PODLASIE -> "podlasie" + LOGIN_TYPE_EDUDZIENNIK -> "edudziennik" + else -> "unknown" + } + + override fun getImageDrawable(context: Context): Drawable { + if (archived) { + return context.getDrawableFromRes(pl.szczodrzynski.edziennik.R.drawable.profile_archived).also { + it.colorFilter = PorterDuffColorFilter(colorFromName(name), PorterDuff.Mode.DST_OVER) + } + } + + if (!image.isNullOrEmpty()) { + try { + return if (image?.endsWith(".gif", true) == true) { + GifDrawable(image ?: "") + } else { + RoundedBitmapDrawableFactory.create(context.resources, image ?: "") + //return Drawable.createFromPath(image ?: "") ?: throw Exception() + } + } + catch (e: Exception) { + e.printStackTrace() + } + } + + return context.getDrawableFromRes(R.drawable.profile).also { + it.colorFilter = PorterDuffColorFilter(colorFromName(name), PorterDuff.Mode.DST_OVER) + } + } + + override fun getImageHolder(context: Context): ImageHolder { + if (archived) { + return ImageHolder(pl.szczodrzynski.edziennik.R.drawable.profile_archived, colorFromName(name)) + } + + return if (!image.isNullOrEmpty()) { + try { + ProfileImageHolder(image ?: "") + } catch (_: Exception) { + ImageHolder(R.drawable.profile, colorFromName(name)) + } + } + else { + ImageHolder(R.drawable.profile, colorFromName(name)) + } + } + override fun applyImageTo(imageView: ImageView) { + getImageHolder(imageView.context).applyTo(imageView) + } + + val supportedFragments: List + get() = when (loginStoreType) { + LoginStore.LOGIN_TYPE_MOBIDZIENNIK, + LoginStore.LOGIN_TYPE_DEMO, + LoginStore.LOGIN_TYPE_VULCAN -> listOf( + MainActivity.DRAWER_ITEM_TIMETABLE, + MainActivity.DRAWER_ITEM_AGENDA, + MainActivity.DRAWER_ITEM_GRADES, + MainActivity.DRAWER_ITEM_MESSAGES, + MainActivity.DRAWER_ITEM_HOMEWORK, + MainActivity.DRAWER_ITEM_BEHAVIOUR, + MainActivity.DRAWER_ITEM_ATTENDANCE + ) + LoginStore.LOGIN_TYPE_LIBRUS, + LoginStore.LOGIN_TYPE_IDZIENNIK -> listOf( + MainActivity.DRAWER_ITEM_TIMETABLE, + MainActivity.DRAWER_ITEM_AGENDA, + MainActivity.DRAWER_ITEM_GRADES, + MainActivity.DRAWER_ITEM_MESSAGES, + MainActivity.DRAWER_ITEM_HOMEWORK, + MainActivity.DRAWER_ITEM_BEHAVIOUR, + MainActivity.DRAWER_ITEM_ATTENDANCE, + MainActivity.DRAWER_ITEM_ANNOUNCEMENTS + ) + LOGIN_TYPE_EDUDZIENNIK -> listOf( + MainActivity.DRAWER_ITEM_TIMETABLE, + MainActivity.DRAWER_ITEM_AGENDA, + MainActivity.DRAWER_ITEM_GRADES, + MainActivity.DRAWER_ITEM_HOMEWORK, + MainActivity.DRAWER_ITEM_BEHAVIOUR, + MainActivity.DRAWER_ITEM_ATTENDANCE, + MainActivity.DRAWER_ITEM_ANNOUNCEMENTS + ) + LOGIN_TYPE_PODLASIE -> listOf( + MainActivity.DRAWER_ITEM_TIMETABLE, + MainActivity.DRAWER_ITEM_AGENDA, + MainActivity.DRAWER_ITEM_GRADES, + MainActivity.DRAWER_ITEM_HOMEWORK + ) + else -> listOf( + MainActivity.DRAWER_ITEM_TIMETABLE, + MainActivity.DRAWER_ITEM_AGENDA, + MainActivity.DRAWER_ITEM_GRADES + ) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/subjects/Subject.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Subject.java similarity index 87% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/subjects/Subject.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Subject.java index f5192f20..a034c785 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/subjects/Subject.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Subject.java @@ -1,10 +1,15 @@ -package pl.szczodrzynski.edziennik.data.db.modules.subjects; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ -import java.util.List; +package pl.szczodrzynski.edziennik.data.db.entity; import androidx.room.ColumnInfo; import androidx.room.Entity; -import pl.szczodrzynski.edziennik.utils.Colors; + +import java.util.List; + +import pl.szczodrzynski.edziennik.ExtensionsKt; @Entity(tableName = "subjects", primaryKeys = {"profileId", "subjectId"}) @@ -26,7 +31,7 @@ public class Subject { this.id = id; this.longName = longName; this.shortName = shortName; - this.color = Colors.stringToColor(this.longName); + this.color = ExtensionsKt.colorFromName(longName); } @Override diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Teacher.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Teacher.kt new file mode 100644 index 00000000..c41b8a7a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Teacher.kt @@ -0,0 +1,220 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.entity + +import android.content.Context +import android.graphics.Bitmap +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Ignore +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.fixName +import pl.szczodrzynski.edziennik.getNameInitials +import pl.szczodrzynski.edziennik.join +import java.util.* + +@Entity(tableName = "teachers", + primaryKeys = ["profileId", "teacherId"]) +open class Teacher { + companion object { + const val TYPE_TEACHER = 0 // 1 + const val TYPE_EDUCATOR = 1 // 2 + const val TYPE_PEDAGOGUE = 2 // 4 + const val TYPE_LIBRARIAN = 3 // 8 + const val TYPE_SECRETARIAT = 4 // 16 + const val TYPE_PRINCIPAL = 5 // 32 + const val TYPE_SCHOOL_ADMIN = 6 // 64 + // not teachers + const val TYPE_SPECIALIST = 7 // 128 + const val TYPE_SUPER_ADMIN = 10 // 1024 + const val TYPE_STUDENT = 12 // 4096 + const val TYPE_PARENT = 14 // 16384 + const val TYPE_PARENTS_COUNCIL = 15 // 32768 + const val TYPE_SCHOOL_PARENTS_COUNCIL = 16 // 65536 + const val TYPE_OTHER = 24 // 16777216 + const val IS_TEACHER_MASK = 127 + + val types: List by lazy { listOf( + TYPE_TEACHER, + TYPE_EDUCATOR, + TYPE_PEDAGOGUE, + TYPE_LIBRARIAN, + TYPE_SECRETARIAT, + TYPE_PRINCIPAL, + TYPE_SCHOOL_ADMIN, + TYPE_SPECIALIST, + TYPE_SUPER_ADMIN, + TYPE_STUDENT, + TYPE_PARENT, + TYPE_PARENTS_COUNCIL, + TYPE_SCHOOL_PARENTS_COUNCIL, + TYPE_OTHER + ) } + + fun typeName(c: Context, type: Int, typeDescription: String? = null): String { + val suffix = typeDescription?.let { " ($typeDescription)" } ?: "" + return when (type) { + TYPE_TEACHER -> c.getString(R.string.teacher_teacher) + TYPE_PARENTS_COUNCIL -> c.getString(R.string.teacher_parents_council) + suffix + TYPE_SCHOOL_PARENTS_COUNCIL -> c.getString(R.string.teacher_school_parents_council) + TYPE_PEDAGOGUE -> c.getString(R.string.teacher_pedagogue) + TYPE_LIBRARIAN -> c.getString(R.string.teacher_librarian) + TYPE_SCHOOL_ADMIN -> c.getString(R.string.teacher_school_admin) + TYPE_SUPER_ADMIN -> c.getString(R.string.teacher_super_admin) + TYPE_SECRETARIAT -> c.getString(R.string.teacher_secretariat) + TYPE_PRINCIPAL -> c.getString(R.string.teacher_principal) + TYPE_EDUCATOR -> c.getString(R.string.teacher_educator) + suffix + TYPE_PARENT -> c.getString(R.string.teacher_parent) + suffix + TYPE_STUDENT -> c.getString(R.string.teacher_student) + suffix + TYPE_SPECIALIST -> c.getString(R.string.teacher_specialist) + else -> c.getString(R.string.teacher_other) + suffix + } + } + } + + var profileId: Int + + @ColumnInfo(name = "teacherId") + var id: Long + + @ColumnInfo(name = "teacherLoginId") + var loginId: String? = null + + @ColumnInfo(name = "teacherName") + var name: String? = "" + + @ColumnInfo(name = "teacherSurname") + var surname: String? = "" + + @ColumnInfo(name = "teacherType") + var type = 0 + + @ColumnInfo(name = "teacherTypeDescription") + var typeDescription: String? = null + + fun isType(checkingType: Int): Boolean { + return type and (1 shl checkingType) >= 1 + } + + val isTeacher: Boolean + get() = type <= IS_TEACHER_MASK + + fun setTeacherType(i: Int) { + type = type or (1 shl i) + } + + fun unsetTeacherType(i: Int) { + type = type and (1 shl i).inv() + } + + fun getTypeText(c: Context): String { + val list = mutableListOf() + types.forEach { + if (isType(it)) + list += typeName(c, it, typeDescription) + } + return list.join(", ") + } + + + @Ignore + var image: Bitmap? = null + + /** + * Used in Message composing - searching in AutoComplete bolds + * the typed part of the full name. + */ + @Ignore + var recipientDisplayName: CharSequence? = null + /** + * Used in Message composing - determining the priority + * of search result, based on the search phrase match + * (beginning of sentence, beginning of word, middle of word). + */ + @Ignore + var recipientWeight: Int = 0 + + @Ignore + constructor(profileId: Int, id: Long) { + this.profileId = profileId + this.id = id + } + + + + @Ignore + constructor(profileId: Int, id: Long, name: String, surname: String) { + this.profileId = profileId + this.id = id + this.name = name + this.surname = surname + } + + constructor(profileId: Int, id: Long, name: String, surname: String, loginId: String?) { + this.profileId = profileId + this.id = id + this.name = name + this.surname = surname + this.loginId = loginId + } + + @Ignore + constructor(teacher: Teacher) { + teacher.let { + this.profileId = it.profileId + this.id = it.id + this.loginId = it.loginId + this.name = it.name + this.surname = it.surname + this.type = it.type + this.typeDescription = it.typeDescription + this.image = it.image + this.recipientDisplayName = it.recipientDisplayName + } + } + + @delegate:Ignore + val fullName by lazy { "$name $surname".fixName() } + + @delegate:Ignore + val fullNameLastFirst by lazy { "$surname $name".fixName() } + + @delegate:Ignore + val initialsLastFirst by lazy { fullNameLastFirst.getNameInitials() } + + val shortName: String + get() = (if (name == null || name?.length == 0) "" else name!![0].toString()) + "." + surname + + override fun toString(): String { + return "Teacher{" + + "profileId=" + profileId + + ", id=" + id + + ", loginId='" + loginId + '\'' + + ", name='" + name + '\'' + + ", surname='" + surname + '\'' + + ", type=" + dumpType() + + ", typeDescription='" + typeDescription + '\'' + + '}' + } + + private fun dumpType(): String { + val typeList: MutableList = ArrayList() + if (isType(TYPE_TEACHER)) typeList.add("TYPE_TEACHER") + if (isType(TYPE_EDUCATOR)) typeList.add("TYPE_EDUCATOR($typeDescription)") + if (isType(TYPE_PEDAGOGUE)) typeList.add("TYPE_PEDAGOGUE") + if (isType(TYPE_LIBRARIAN)) typeList.add("TYPE_PEDAGOGUE") + if (isType(TYPE_SECRETARIAT)) typeList.add("TYPE_SECRETARIAT") + if (isType(TYPE_PRINCIPAL)) typeList.add("TYPE_PRINCIPAL") + if (isType(TYPE_SCHOOL_ADMIN)) typeList.add("TYPE_SCHOOL_ADMIN") + if (isType(TYPE_SPECIALIST)) typeList.add("TYPE_SPECIALIST") + if (isType(TYPE_SUPER_ADMIN)) typeList.add("TYPE_SUPER_ADMIN") + if (isType(TYPE_STUDENT)) typeList.add("TYPE_STUDENT") + if (isType(TYPE_PARENT)) typeList.add("TYPE_PARENT") + if (isType(TYPE_PARENTS_COUNCIL)) typeList.add("TYPE_PARENTS_COUNCIL") + if (isType(TYPE_SCHOOL_PARENTS_COUNCIL)) typeList.add("TYPE_SCHOOL_PARENTS_COUNCIL") + if (isType(TYPE_OTHER)) typeList.add("TYPE_OTHER($typeDescription)") + return typeList.join(", ") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/TeacherAbsence.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/TeacherAbsence.kt new file mode 100644 index 00000000..9ec5f828 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/TeacherAbsence.kt @@ -0,0 +1,41 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Ignore +import androidx.room.Index +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time + +@Entity(tableName = "teacherAbsence", + primaryKeys = ["profileId", "teacherAbsenceId"], + indices = [ + Index(value = ["profileId"]) + ]) +open class TeacherAbsence( + val profileId: Int, + @ColumnInfo(name = "teacherAbsenceId") + val id: Long, + @ColumnInfo(name = "teacherAbsenceType") + val type: Long, + @ColumnInfo(name = "teacherAbsenceName") + val name: String?, + + @ColumnInfo(name = "teacherAbsenceDateFrom") + val dateFrom: Date, + @ColumnInfo(name = "teacherAbsenceDateTo") + val dateTo: Date, + @ColumnInfo(name = "teacherAbsenceTimeFrom") + val timeFrom: Time?, + @ColumnInfo(name = "teacherAbsenceTimeTo") + val timeTo: Time?, + + val teacherId: Long, + var addedDate: Long = System.currentTimeMillis() +) : Keepable() { + @Ignore + var showAsUnseen = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceType.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/TeacherAbsenceType.kt similarity index 87% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceType.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/TeacherAbsenceType.kt index ca9db678..768f1b04 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceType.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/TeacherAbsenceType.kt @@ -2,7 +2,7 @@ * Copyright (c) Kacper Ziubryniewicz 2019-10-18 */ -package pl.szczodrzynski.edziennik.data.db.modules.teachers +package pl.szczodrzynski.edziennik.data.db.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teams/Team.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Team.java similarity index 92% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teams/Team.java rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Team.java index 1b2f0b9d..2d22e8a2 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teams/Team.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/Team.java @@ -1,4 +1,8 @@ -package pl.szczodrzynski.edziennik.data.db.modules.teams; +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-6 + */ + +package pl.szczodrzynski.edziennik.data.db.entity; import androidx.room.ColumnInfo; import androidx.room.Entity; diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/TimetableManual.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/TimetableManual.kt new file mode 100644 index 00000000..2f80e828 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/entity/TimetableManual.kt @@ -0,0 +1,63 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-2-22. + */ + +package pl.szczodrzynski.edziennik.data.db.entity + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.Index +import androidx.room.PrimaryKey +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time + +@Entity(tableName = "timetableManual", + indices = [ + Index(value = ["profileId", "date"]), + Index(value = ["profileId", "weekDay"]) + ]) +class TimetableManual( + val profileId: Int, + var type: Int, + var repeatBy: Int, + + @PrimaryKey(autoGenerate = true) + var id: Int = 0 +) { + companion object { + const val TYPE_NORMAL = 0 + const val TYPE_CANCELLED = 1 + const val TYPE_CHANGE = 2 + const val TYPE_SHIFTED_SOURCE = 3 + const val TYPE_SHIFTED_TARGET = 4 + const val TYPE_REMOVED = 5 + const val TYPE_CLASSROOM = 6 + const val REPEAT_WEEKLY = 0 + const val REPEAT_ONCE = 1 + const val REPEAT_BY_SUBJECT = 2 + } + + // `date` for one time lesson + @ColumnInfo(typeAffinity = ColumnInfo.INTEGER) + var date: Date? = null + // `weekDay` for repeating lesson (every week) + var weekDay: Int? = null + + var lessonNumber: Int? = null + var startTime: Time? = null + var endTime: Time? = null + + var subjectId: Long? = null + var teacherId: Long? = null + var teamId: Long? = null + var classroom: String? = null + + fun verifyParams(): Boolean { + return when (repeatBy) { + REPEAT_WEEKLY -> date == null && weekDay != null + REPEAT_ONCE -> date != null && weekDay == null + REPEAT_BY_SUBJECT -> date == null && weekDay == null && subjectId != null + else -> false + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/AnnouncementFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/AnnouncementFull.kt new file mode 100644 index 00000000..5b4cb711 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/AnnouncementFull.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.full + +import pl.szczodrzynski.edziennik.data.db.entity.Announcement +import pl.szczodrzynski.edziennik.utils.models.Date + +class AnnouncementFull( + profileId: Int, id: Long, + subject: String, text: String?, + startDate: Date?, endDate: Date?, + teacherId: Long, addedDate: Long = System.currentTimeMillis() +) : Announcement( + profileId, id, + subject, text, + startDate, endDate, + teacherId, addedDate +) { + var teacherName: String? = null + + // metadata + var seen = false + var notified = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/AttendanceFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/AttendanceFull.kt new file mode 100644 index 00000000..f235fafd --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/AttendanceFull.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-24. + */ +package pl.szczodrzynski.edziennik.data.db.full + +import pl.szczodrzynski.edziennik.data.db.entity.Attendance +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time + +class AttendanceFull( + profileId: Int, id: Long, + baseType: Int, typeName: String, typeShort: String, typeSymbol: String, typeColor: Int?, + date: Date, startTime: Time, semester: Int, + teacherId: Long, subjectId: Long, addedDate: Long = System.currentTimeMillis() +) : Attendance( + profileId, id, + baseType, typeName, typeShort, typeSymbol, typeColor, + date, startTime, semester, + teacherId, subjectId, addedDate +) { + var teacherName: String? = null + var subjectLongName: String? = null + var subjectShortName: String? = null + + // metadata + var seen = false + get() = field || baseType == TYPE_PRESENT + var notified = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt new file mode 100644 index 00000000..01e85395 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/EventFull.kt @@ -0,0 +1,54 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.full + +import pl.szczodrzynski.edziennik.data.db.entity.Event +import pl.szczodrzynski.edziennik.data.db.entity.Metadata +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time + +class EventFull( + profileId: Int, id: Long, date: Date, time: Time?, + topic: String, color: Int?, type: Long, + teacherId: Long, subjectId: Long, teamId: Long, addedDate: Long = System.currentTimeMillis() +) : Event( + profileId, id, date, time, + topic, color, type, + teacherId, subjectId, teamId, addedDate +) { + constructor(event: Event, metadata: Metadata? = null) : this( + event.profileId, event.id, event.date, event.time, + event.topic, event.color, event.type, + event.teacherId, event.subjectId, event.teamId, event.addedDate) { + event.let { + addedManually = it.addedManually + sharedBy = it.sharedBy + sharedByName = it.sharedByName + blacklisted = it.blacklisted + homeworkBody = it.homeworkBody + attachmentIds = it.attachmentIds + attachmentNames = it.attachmentNames + } + metadata?.let { + seen = it.seen + notified = it.notified + } + } + + var typeName: String? = null + var typeColor: Int? = null + + var teacherName: String? = null + var subjectLongName: String? = null + var subjectShortName: String? = null + var teamName: String? = null + var teamCode: String? = null + + // metadata + var seen = false + var notified = false + + val eventColor + get() = color ?: typeColor ?: 0xff2196f3.toInt() +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/GradeFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/GradeFull.kt new file mode 100644 index 00000000..f8d90c05 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/GradeFull.kt @@ -0,0 +1,26 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-24. + */ +package pl.szczodrzynski.edziennik.data.db.full + +import pl.szczodrzynski.edziennik.data.db.entity.Grade + +class GradeFull( + profileId: Int, id: Long, name: String, type: Int, + value: Float, weight: Float, color: Int, + category: String?, description: String?, comment: String?, + semester: Int, teacherId: Long, subjectId: Long, addedDate: Long = System.currentTimeMillis() +) : Grade( + profileId, id, name, type, + value, weight, color, + category, description, comment, + semester, teacherId, subjectId, addedDate +) { + var teacherName: String? = null + var subjectLongName: String? = null + var subjectShortName: String? = null + + // metadata + var seen = false + var notified = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/LessonFull.kt similarity index 93% rename from app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt rename to app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/LessonFull.kt index 41b761ac..0e9542b6 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/LessonFull.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/LessonFull.kt @@ -1,10 +1,18 @@ -package pl.szczodrzynski.edziennik.data.db.modules.timetable +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.full import android.content.Context import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.entity.Lesson import pl.szczodrzynski.edziennik.utils.models.Time -class LessonFull(profileId: Int, id: Long) : Lesson(profileId, id) { +class LessonFull( + profileId: Int, id: Long +) : Lesson( + profileId, id +) { var subjectName: String? = null var teacherName: String? = null var teamName: String? = null @@ -125,5 +133,4 @@ class LessonFull(profileId: Int, id: Long) : Lesson(profileId, id) { // metadata var seen: Boolean = false var notified: Boolean = false - var addedDate: Long = 0 } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/LuckyNumberFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/LuckyNumberFull.kt new file mode 100644 index 00000000..bb24724a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/LuckyNumberFull.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.full + +import pl.szczodrzynski.edziennik.data.db.entity.LuckyNumber +import pl.szczodrzynski.edziennik.utils.models.Date + +class LuckyNumberFull( + profileId: Int, date: Date, + number: Int +) : LuckyNumber( + profileId, date, + number +) { + // metadata + var seen = false + var notified = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageFull.kt new file mode 100644 index 00000000..96103f38 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageFull.kt @@ -0,0 +1,38 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.full + +import androidx.room.Ignore +import androidx.room.Relation +import pl.szczodrzynski.edziennik.data.db.entity.Message +import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient + +class MessageFull( + profileId: Int, id: Long, type: Int, + subject: String, body: String?, senderId: Long?, + addedDate: Long = System.currentTimeMillis() +) : Message( + profileId, id, type, + subject, body, senderId, + addedDate +) { + var senderName: String? = null + @Relation(parentColumn = "messageId", entityColumn = "messageId", entity = MessageRecipient::class) + var recipients: MutableList? = null + + fun addRecipient(recipient: MessageRecipientFull): MessageFull { + if (recipients == null) recipients = mutableListOf() + recipients?.add(recipient) + return this + } + + @Ignore + var filterWeight = 0 + @Ignore + var searchHighlightText: CharSequence? = null + + // metadata + var seen = false + var notified = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageRecipientFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageRecipientFull.kt new file mode 100644 index 00000000..2126f872 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/MessageRecipientFull.kt @@ -0,0 +1,14 @@ +package pl.szczodrzynski.edziennik.data.db.full + +import androidx.room.Ignore +import pl.szczodrzynski.edziennik.data.db.entity.MessageRecipient + +class MessageRecipientFull( + profileId: Int, + id: Long, + messageId: Long, + readDate: Long = -1L +) : MessageRecipient(profileId, id, -1, readDate, messageId) { + @Ignore + var fullName: String? = null +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/NoticeFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/NoticeFull.kt new file mode 100644 index 00000000..25aee14d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/NoticeFull.kt @@ -0,0 +1,22 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.full + +import pl.szczodrzynski.edziennik.data.db.entity.Notice + +class NoticeFull( + profileId: Int, id: Long, type: Int, semester: Int, + text: String, category: String?, points: Float?, + teacherId: Long, addedDate: Long = System.currentTimeMillis() +) : Notice( + profileId, id, type, semester, + text, category, points, + teacherId, addedDate +) { + var teacherName: String? = null + + // metadata + var seen = false + var notified = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/TeacherAbsenceFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/TeacherAbsenceFull.kt new file mode 100644 index 00000000..39a88e0f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/full/TeacherAbsenceFull.kt @@ -0,0 +1,24 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-25. + */ +package pl.szczodrzynski.edziennik.data.db.full + +import pl.szczodrzynski.edziennik.data.db.entity.TeacherAbsence +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time + +class TeacherAbsenceFull( + profileId: Int, id: Long, type: Long, name: String?, + dateFrom: Date, dateTo: Date, timeFrom: Time?, timeTo: Time?, + teacherId: Long, addedDate: Long = System.currentTimeMillis() +) : TeacherAbsence( + profileId, id, type, name, + dateFrom, dateTo, timeFrom, timeTo, + teacherId, addedDate +) { + var teacherName: String? = null + + // metadata + var seen: Boolean = false + var notified: Boolean = false +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration12.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration12.kt new file mode 100644 index 00000000..30e18c88 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration12.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration12 : Migration(11, 12) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("PRAGMA foreign_keys=off;") + database.execSQL("ALTER TABLE teams RENAME TO _teams_old;") + database.execSQL("CREATE TABLE teams (profileId INTEGER NOT NULL, teamId INTEGER NOT NULL, teamType INTEGER NOT NULL, teamName TEXT, teamTeacherId INTEGER NOT NULL, PRIMARY KEY(profileId, teamId));") + database.execSQL("INSERT INTO teams (profileId, teamId, teamType, teamName, teamTeacherId) SELECT profileId, teamId, teamType, teamName, teacherId FROM _teams_old;") + database.execSQL("DROP TABLE _teams_old;") + database.execSQL("PRAGMA foreign_keys=on;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration13.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration13.kt new file mode 100644 index 00000000..e863cb68 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration13.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration13 : Migration(12, 13) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE lessonChanges ADD lessonChangeWeekDay INTEGER NOT NULL DEFAULT -1;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration14.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration14.kt new file mode 100644 index 00000000..688da9a2 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration14.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration14 : Migration(13, 14) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("CREATE TABLE loginStores (loginStoreId INTEGER NOT NULL, loginStoreType INTEGER NOT NULL, loginStoreData TEXT, PRIMARY KEY(loginStoreId));") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration15.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration15.kt new file mode 100644 index 00000000..ec34612f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration15.kt @@ -0,0 +1,33 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration15 : Migration(14, 15) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE grades RENAME TO _grades_old;") + database.execSQL("CREATE TABLE `grades` (\n" + + "\t`profileId`\tINTEGER NOT NULL,\n" + + "\t`gradeId`\tINTEGER NOT NULL,\n" + + "\t`gradeDescription`\tTEXT,\n" + + "\t`gradeName`\tTEXT,\n" + + "\t`gradeValue`\tREAL NOT NULL,\n" + + "\t`gradeWeight`\tREAL NOT NULL,\n" + + "\t`gradeSemester`\tINTEGER NOT NULL,\n" + + "\t`gradeType`\tINTEGER NOT NULL,\n" + + "\t`teacherId`\tINTEGER NOT NULL,\n" + + "\t`categoryId`\tINTEGER NOT NULL,\n" + + "\t`subjectId`\tINTEGER NOT NULL,\n" + + "\tPRIMARY KEY(`profileId`,`gradeId`)\n" + + ");") + database.execSQL("INSERT INTO grades\n" + + " SELECT *\n" + + " FROM _grades_old;") + database.execSQL("DROP TABLE _grades_old;") + database.execSQL("CREATE INDEX index_grades_profileId ON grades (profileId);") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration16.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration16.kt new file mode 100644 index 00000000..579c2e55 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration16.kt @@ -0,0 +1,41 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration16 : Migration(15, 16) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE profiles ( + profileId INTEGER NOT NULL, + name TEXT, + subname TEXT, + image TEXT, + syncEnabled INTEGER NOT NULL, + syncNotifications INTEGER NOT NULL, + enableSharedEvents INTEGER NOT NULL, + countInSeconds INTEGER NOT NULL, + loggedIn INTEGER NOT NULL, + empty INTEGER NOT NULL, + studentNameLong TEXT, + studentNameShort TEXT, + studentNumber INTEGER NOT NULL, + studentData TEXT, + registration INTEGER NOT NULL, + gradeColorMode INTEGER NOT NULL, + agendaViewType INTEGER NOT NULL, + currentSemester INTEGER NOT NULL, + attendancePercentage REAL NOT NULL, + dateSemester1Start TEXT, + dateSemester2Start TEXT, + dateYearEnd TEXT, + luckyNumberEnabled INTEGER NOT NULL, + luckyNumber INTEGER NOT NULL, + luckyNumberDate TEXT, + loginStoreId INTEGER NOT NULL, + PRIMARY KEY(profileId));""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration17.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration17.kt new file mode 100644 index 00000000..d033b408 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration17.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration17 : Migration(16, 17) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE profiles ADD archived INTEGER NOT NULL DEFAULT 0;") + database.execSQL("ALTER TABLE teams ADD teamCode TEXT;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration18.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration18.kt new file mode 100644 index 00000000..c213aa40 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration18.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration18 : Migration(17, 18) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE events ADD eventBlacklisted INTEGER NOT NULL DEFAULT 0;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration19.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration19.kt new file mode 100644 index 00000000..77c1b8d3 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration19.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration19 : Migration(18, 19) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE grades ADD gradeClassAverage REAL NOT NULL DEFAULT -1;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration20.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration20.kt new file mode 100644 index 00000000..bb5741a5 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration20.kt @@ -0,0 +1,18 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration20 : Migration(19, 20) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE luckyNumbers ( + profileId INTEGER NOT NULL, + luckyNumberDate TEXT NOT NULL, + luckyNumber INTEGER NOT NULL, + PRIMARY KEY(profileId, luckyNumberDate));""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration21.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration21.kt new file mode 100644 index 00000000..d69ea451 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration21.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration21 : Migration(20, 21) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE grades ADD gradeCategory TEXT") + database.execSQL("ALTER TABLE grades ADD gradeColor INTEGER NOT NULL DEFAULT -1") + database.execSQL("DROP TABLE gradeCategories") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration22.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration22.kt new file mode 100644 index 00000000..fe90df4e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration22.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration22 : Migration(21, 22) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE eventTypes ( + profileId INTEGER NOT NULL, + eventType INTEGER NOT NULL, + eventTypeName TEXT, + eventTypeColor INTEGER NOT NULL, + PRIMARY KEY(profileId, eventType));""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration23.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration23.kt new file mode 100644 index 00000000..ec290688 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration23.kt @@ -0,0 +1,53 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration23 : Migration(22, 23) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE grades RENAME TO _grades_old;") + database.execSQL("""CREATE TABLE `grades` ( + `profileId` INTEGER NOT NULL, + `gradeId` INTEGER NOT NULL, + `gradeCategory` TEXT, + `gradeColor` INTEGER NOT NULL DEFAULT -1, + `gradeDescription` TEXT, + `gradeName` TEXT, + `gradeValue` REAL NOT NULL, + `gradeWeight` REAL NOT NULL, + `gradeSemester` INTEGER NOT NULL, + `gradeClassAverage` REAL NOT NULL DEFAULT -1, + `gradeType` INTEGER NOT NULL, + `teacherId` INTEGER NOT NULL, + `subjectId` INTEGER NOT NULL, + PRIMARY KEY(`profileId`,`gradeId`))""") + + database.execSQL("DROP INDEX index_grades_profileId") + database.execSQL("CREATE INDEX `index_grades_profileId` ON `grades` (`profileId`)") + + database.execSQL("INSERT INTO grades (profileId, gradeId, gradeDescription, gradeName, gradeValue, gradeWeight, gradeSemester, gradeType, teacherId, subjectId, gradeClassAverage, gradeCategory, gradeColor) SELECT profileId, gradeId, gradeDescription, gradeName, gradeValue, gradeWeight, gradeSemester, gradeType, teacherId, subjectId, gradeClassAverage, gradeCategory, gradeColor FROM _grades_old;") + database.execSQL("DROP TABLE _grades_old;") + database.execSQL("ALTER TABLE attendances RENAME TO _attendances_old;") + + database.execSQL("""CREATE TABLE `attendances` ( + `profileId` INTEGER NOT NULL, + `attendanceId` INTEGER NOT NULL, + `attendanceLessonDate` TEXT NOT NULL, + `attendanceStartTime` TEXT NOT NULL, + `attendanceLessonTopic` TEXT, + `attendanceSemester` INTEGER NOT NULL, + `attendanceType` INTEGER NOT NULL, + `teacherId` INTEGER NOT NULL, + `subjectId` INTEGER NOT NULL, + PRIMARY KEY(`profileId`,`attendanceId`,`attendanceLessonDate`,`attendanceStartTime`))""") + + database.execSQL("DROP INDEX index_attendances_profileId") + database.execSQL("CREATE INDEX `index_attendances_profileId` ON `attendances` (`profileId`);") + database.execSQL("INSERT INTO attendances SELECT * FROM _attendances_old;") + database.execSQL("DROP TABLE _attendances_old;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration24.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration24.kt new file mode 100644 index 00000000..7235bf6e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration24.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration24 : Migration(23, 24) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE profiles ADD yearAverageMode INTEGER NOT NULL DEFAULT 0") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration25.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration25.kt new file mode 100644 index 00000000..9ac59c2d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration25.kt @@ -0,0 +1,23 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration25 : Migration(24, 25) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE announcements ( + profileId INTEGER NOT NULL, + announcementId INTEGER NOT NULL, + announcementSubject TEXT, + announcementText TEXT, + announcementStartDate TEXT, + announcementEndDate TEXT, + teacherId INTEGER NOT NULL, + PRIMARY KEY(profileId, announcementId))""") + database.execSQL("CREATE INDEX index_announcements_profileId ON announcements (profileId)") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration26.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration26.kt new file mode 100644 index 00000000..1aa17f5f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration26.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration26 : Migration(25, 26) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE grades ADD gradePointGrade INTEGER NOT NULL DEFAULT 0;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration27.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration27.kt new file mode 100644 index 00000000..e7ed81ff --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration27.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration27 : Migration(26, 27) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE grades ADD gradeValueMax REAL NOT NULL DEFAULT 0;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration28.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration28.kt new file mode 100644 index 00000000..5045a4fa --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration28.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration28 : Migration(27, 28) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("CREATE TABLE gradeCategories (profileId INTEGER NOT NULL, categoryId INTEGER NOT NULL, weight REAL NOT NULL, color INTEGER NOT NULL, `text` TEXT, columns TEXT, valueFrom REAL NOT NULL, valueTo REAL NOT NULL, PRIMARY KEY(profileId, categoryId));") + database.execSQL("ALTER TABLE grades ADD gradeComment TEXT;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration29.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration29.kt new file mode 100644 index 00000000..3b4baa4d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration29.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration29 : Migration(28, 29) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("CREATE TABLE feedbackMessages (messageId INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, received INTEGER NOT NULL DEFAULT 0, sentTime INTEGER NOT NULL, `text` TEXT)") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration30.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration30.kt new file mode 100644 index 00000000..fc6813e8 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration30.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration30 : Migration(29, 30) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE feedbackMessages ADD fromUser TEXT DEFAULT NULL") + database.execSQL("ALTER TABLE feedbackMessages ADD fromUserName TEXT DEFAULT NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration31.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration31.kt new file mode 100644 index 00000000..a29bff06 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration31.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration31 : Migration(30, 31) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE messages ( + profileId INTEGER NOT NULL, + messageId INTEGER NOT NULL, + messageSubject TEXT, + messageBody TEXT DEFAULT NULL, + messageType INTEGER NOT NULL DEFAULT 0, + senderId INTEGER NOT NULL DEFAULT -1, + senderReplyId INTEGER NOT NULL DEFAULT -1, + recipientIds TEXT DEFAULT NULL, + recipientReplyIds TEXT DEFAULT NULL, + readByRecipientDates TEXT DEFAULT NULL, + overrideHasAttachments INTEGER NOT NULL DEFAULT 0, + attachmentIds TEXT DEFAULT NULL, + attachmentNames TEXT DEFAULT NULL, + PRIMARY KEY(profileId, messageId))""") + database.execSQL("CREATE INDEX index_messages_profileId ON messages (profileId)") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration32.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration32.kt new file mode 100644 index 00000000..800e863f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration32.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration32 : Migration(31, 32) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE messages ADD attachmentSizes TEXT DEFAULT NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration33.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration33.kt new file mode 100644 index 00000000..530620a4 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration33.kt @@ -0,0 +1,36 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration33 : Migration(32, 33) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("DROP TABLE messages") + database.execSQL("""CREATE TABLE messages ( + profileId INTEGER NOT NULL, + messageId INTEGER NOT NULL, + messageSubject TEXT, + messageBody TEXT DEFAULT NULL, + messageType INTEGER NOT NULL DEFAULT 0, + senderId INTEGER NOT NULL DEFAULT -1, + senderReplyId INTEGER NOT NULL DEFAULT -1, + overrideHasAttachments INTEGER NOT NULL DEFAULT 0, + attachmentIds TEXT DEFAULT NULL, + attachmentNames TEXT DEFAULT NULL, + attachmentSizes TEXT DEFAULT NULL, + PRIMARY KEY(profileId, messageId))""") + database.execSQL("CREATE INDEX index_messages_profileId ON messages (profileId)") + + database.execSQL("""CREATE TABLE messageRecipients ( + profileId INTEGER NOT NULL, + messageRecipientId INTEGER NOT NULL DEFAULT -1, + messageRecipientReplyId INTEGER NOT NULL DEFAULT -1, + messageRecipientReadDate INTEGER NOT NULL DEFAULT -1, + messageId INTEGER NOT NULL, + PRIMARY KEY(profileId, messageRecipientId))""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration34.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration34.kt new file mode 100644 index 00000000..6a081edc --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration34.kt @@ -0,0 +1,21 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration34 : Migration(33, 34) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("DROP TABLE messageRecipients") + database.execSQL("""CREATE TABLE messageRecipients ( + profileId INTEGER NOT NULL, + messageRecipientId INTEGER NOT NULL DEFAULT -1, + messageRecipientReplyId INTEGER NOT NULL DEFAULT -1, + messageRecipientReadDate INTEGER NOT NULL DEFAULT -1, + messageId INTEGER NOT NULL, + PRIMARY KEY(profileId, messageRecipientId, messageId))""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration35.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration35.kt new file mode 100644 index 00000000..e588ecad --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration35.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration35 : Migration(34, 35) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE teachers ADD teacherLoginId TEXT DEFAULT NULL;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration36.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration36.kt new file mode 100644 index 00000000..c37ca84a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration36.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration36 : Migration(35, 36) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("UPDATE profiles SET yearAverageMode = 4 WHERE yearAverageMode = 0") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration37.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration37.kt new file mode 100644 index 00000000..00035a96 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration37.kt @@ -0,0 +1,12 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration37 : Migration(36, 37) { + override fun migrate(database: SupportSQLiteDatabase) {} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration38.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration38.kt new file mode 100644 index 00000000..86b00f44 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration38.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase +import pl.szczodrzynski.edziennik.utils.models.Date + +class Migration38 : Migration(37, 38) { + override fun migrate(database: SupportSQLiteDatabase) { + val today = Date.getToday() + val schoolYearStart = if (today.month < 9) today.year - 1 else today.year + database.execSQL("UPDATE profiles SET dateSemester1Start = '$schoolYearStart-09-01' WHERE dateSemester1Start IS NULL") + database.execSQL("UPDATE profiles SET dateSemester2Start = '${schoolYearStart + 1}-02-01' WHERE dateSemester2Start IS NULL") + database.execSQL("UPDATE profiles SET dateYearEnd = '${schoolYearStart + 1}-06-30' WHERE dateYearEnd IS NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration39.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration39.kt new file mode 100644 index 00000000..d13805f2 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration39.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration39 : Migration(38, 39) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("CREATE TABLE debugLogs (id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, `text` TEXT)") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration40.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration40.kt new file mode 100644 index 00000000..facbfc7c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration40.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration40 : Migration(39, 40) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE profiles ADD changedEndpoints TEXT DEFAULT NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration41.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration41.kt new file mode 100644 index 00000000..7b6236ab --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration41.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration41 : Migration(40, 41) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("UPDATE profiles SET empty = 1") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration42.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration42.kt new file mode 100644 index 00000000..e4b8fcfa --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration42.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration42 : Migration(41, 42) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("UPDATE profiles SET empty = 1") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration43.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration43.kt new file mode 100644 index 00000000..524e7b3e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration43.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration43 : Migration(42, 43) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE profiles ADD lastFullSync INTEGER NOT NULL DEFAULT 0") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration44.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration44.kt new file mode 100644 index 00000000..a800473c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration44.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration44 : Migration(43, 44) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("UPDATE profiles SET empty = 1") + database.execSQL("UPDATE profiles SET currentSemester = 1") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration45.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration45.kt new file mode 100644 index 00000000..25a3d773 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration45.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration45 : Migration(44, 45) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("UPDATE profiles SET empty = 1") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration46.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration46.kt new file mode 100644 index 00000000..0025f991 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration46.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration46 : Migration(45, 46) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("UPDATE profiles SET lastFullSync = 0") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration47.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration47.kt new file mode 100644 index 00000000..a7d8f90c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration47.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration47 : Migration(46, 47) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("UPDATE profiles SET lastFullSync = 0") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration48.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration48.kt new file mode 100644 index 00000000..516115e8 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration48.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration48 : Migration(47, 48) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE notices ADD points REAL NOT NULL DEFAULT 0") + database.execSQL("ALTER TABLE notices ADD category TEXT DEFAULT NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration49.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration49.kt new file mode 100644 index 00000000..fa98dc23 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration49.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration49 : Migration(48, 49) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE grades ADD gradeParentId INTEGER NOT NULL DEFAULT -1") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration50.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration50.kt new file mode 100644 index 00000000..361f6c8d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration50.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration50 : Migration(49, 50) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE grades ADD gradeIsImprovement INTEGER NOT NULL DEFAULT 0") + database.execSQL("DELETE FROM attendances WHERE attendances.profileId IN (SELECT profiles.profileId FROM profiles JOIN loginStores USING(loginStoreId) WHERE loginStores.loginStoreType = 1)") + database.execSQL("UPDATE profiles SET empty = 1 WHERE profileId IN (SELECT profiles.profileId FROM profiles JOIN loginStores USING(loginStoreId) WHERE loginStores.loginStoreType = 4)") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration51.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration51.kt new file mode 100644 index 00000000..05ef3ff6 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration51.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration51 : Migration(50, 51) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE profiles ADD lastReceiversSync INTEGER NOT NULL DEFAULT 0") + database.execSQL("ALTER TABLE teachers ADD teacherType INTEGER NOT NULL DEFAULT 0") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration52.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration52.kt new file mode 100644 index 00000000..aa1a2638 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration52.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration52 : Migration(51, 52) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE teachers ADD teacherTypeDescription TEXT DEFAULT NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration53.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration53.kt new file mode 100644 index 00000000..04a2aa70 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration53.kt @@ -0,0 +1,21 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration53 : Migration(52, 53) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE IF NOT EXISTS teacherAbsence ( + profileId INTEGER NOT NULL, + teacherAbsenceId INTEGER NOT NULL, + teacherId INTEGER NOT NULL, + teacherAbsenceType INTEGER NOT NULL, + teacherAbsenceDateFrom TEXT NOT NULL, + teacherAbsenceDateTo TEXT NOT NULL, + PRIMARY KEY(profileId, teacherAbsenceId))""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration54.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration54.kt new file mode 100644 index 00000000..26285a7a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration54.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration54 : Migration(53, 54) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE teacherAbsence ADD teacherAbsenceTimeFrom TEXT DEFAULT NULL") + database.execSQL("ALTER TABLE teacherAbsence ADD teacherAbsenceTimeTo TEXT DEFAULT NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration55.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration55.kt new file mode 100644 index 00000000..bbeb16a2 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration55.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration55 : Migration(54, 55) { + override fun migrate(database: SupportSQLiteDatabase) { + // 2019-10-21 for merge compatibility between 3.1.1 and api-v2 + // moved to Migration 55->56 + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration56.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration56.kt new file mode 100644 index 00000000..4517b078 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration56.kt @@ -0,0 +1,27 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration56 : Migration(55, 56) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE IF NOT EXISTS endpointTimers ( + profileId INTEGER NOT NULL, + endpointId INTEGER NOT NULL, + endpointLastSync INTEGER DEFAULT NULL, + endpointNextSync INTEGER NOT NULL DEFAULT 1, + endpointViewId INTEGER DEFAULT NULL, + PRIMARY KEY(profileId, endpointId))""") + + database.execSQL("""CREATE TABLE IF NOT EXISTS lessonRanges ( + profileId INTEGER NOT NULL, + lessonRangeNumber INTEGER NOT NULL, + lessonRangeStart TEXT NOT NULL, + lessonRangeEnd TEXT NOT NULL, + PRIMARY KEY(profileId, lessonRangeNumber))""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration57.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration57.kt new file mode 100644 index 00000000..d46cb60d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration57.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration57 : Migration(56, 57) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE gradeCategories ADD type INTEGER NOT NULL DEFAULT 0") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration58.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration58.kt new file mode 100644 index 00000000..d0ebf548 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration58.kt @@ -0,0 +1,29 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase +import pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_EVENT +import pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_HOMEWORK + +class Migration58 : Migration(57, 58) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE metadata RENAME TO _metadata_old;") + database.execSQL("DROP INDEX index_metadata_profileId_thingType_thingId;") + database.execSQL("UPDATE _metadata_old SET thingType = $TYPE_HOMEWORK WHERE thingType = $TYPE_EVENT AND thingId IN (SELECT eventId FROM events WHERE eventType = -1)") + database.execSQL("""CREATE TABLE metadata ( + profileId INTEGER NOT NULL, + metadataId INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, + thingType INTEGER NOT NULL, + thingId INTEGER NOT NULL, + seen INTEGER NOT NULL, + notified INTEGER NOT NULL, + addedDate INTEGER NOT NULL)""") + database.execSQL("INSERT INTO metadata SELECT * FROM (SELECT * FROM _metadata_old ORDER BY addedDate DESC) GROUP BY thingId;") + database.execSQL("DROP TABLE _metadata_old;") + database.execSQL("CREATE UNIQUE INDEX index_metadata_profileId_thingType_thingId ON metadata (profileId, thingType, thingId);") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration59.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration59.kt new file mode 100644 index 00000000..d7ead712 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration59.kt @@ -0,0 +1,35 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration59 : Migration(58, 59) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("UPDATE metadata SET addedDate = addedDate*1000 WHERE addedDate < 10000000000;") + database.execSQL("""INSERT INTO metadata (profileId, thingType, thingId, seen, notified, addedDate) + SELECT profileId, + 10 AS thingType, + luckyNumberDate*10000+substr(luckyNumberDate, 6)*100+substr(luckyNumberDate, 9) AS thingId, + 1 AS seen, + 1 AS notified, + CAST(strftime('%s', luckyNumberDate) AS INT)*1000 AS addedDate + FROM luckyNumbers""") + + database.execSQL("ALTER TABLE luckyNumbers RENAME TO _old_luckyNumbers;") + database.execSQL("""CREATE TABLE luckyNumbers ( + profileId INTEGER NOT NULL, + luckyNumberDate INTEGER NOT NULL, + luckyNumber INTEGER NOT NULL, + PRIMARY KEY(profileId, luckyNumberDate))""") + + database.execSQL("""INSERT INTO luckyNumbers (profileId, luckyNumberDate, luckyNumber) + SELECT profileId, + luckyNumberDate * 10000 + substr(luckyNumberDate, 6) * 100 + substr(luckyNumberDate, 9) AS luckyNumberDate, + luckyNumber FROM _old_luckyNumbers;""") + database.execSQL("DROP TABLE _old_luckyNumbers;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration60.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration60.kt new file mode 100644 index 00000000..a518212e --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration60.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration60 : Migration(59, 60) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE notifications ( + id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, + title TEXT NOT NULL, + `text` TEXT NOT NULL, + `type` INTEGER NOT NULL, + profileId INTEGER DEFAULT NULL, + profileName TEXT DEFAULT NULL, + posted INTEGER NOT NULL DEFAULT 0, + viewId INTEGER DEFAULT NULL, + extras TEXT DEFAULT NULL, + addedDate INTEGER NOT NULL)""") + database.execSQL("ALTER TABLE profiles ADD COLUMN disabledNotifications TEXT DEFAULT NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration61.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration61.kt new file mode 100644 index 00000000..334ecb65 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration61.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration61 : Migration(60, 61) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE IF NOT EXISTS teacherAbsenceTypes ( + profileId INTEGER NOT NULL, + teacherAbsenceTypeId INTEGER NOT NULL, + teacherAbsenceTypeName TEXT NOT NULL, + PRIMARY KEY(profileId, teacherAbsenceTypeId))""") + database.execSQL("ALTER TABLE teacherAbsence ADD COLUMN teacherAbsenceName TEXT DEFAULT NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration62.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration62.kt new file mode 100644 index 00000000..86f70b04 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration62.kt @@ -0,0 +1,32 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration62 : Migration(61, 62) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE IF NOT EXISTS classrooms ( + profileId INTEGER NOT NULL, + id INTEGER NOT NULL, + name TEXT NOT NULL, + PRIMARY KEY(profileId, id))""") + + database.execSQL("""CREATE TABLE IF NOT EXISTS noticeTypes ( + profileId INTEGER NOT NULL, + id INTEGER NOT NULL, + name TEXT NOT NULL, + PRIMARY KEY(profileId, id))""") + + database.execSQL("""CREATE TABLE IF NOT EXISTS attendanceTypes ( + profileId INTEGER NOT NULL, + id INTEGER NOT NULL, + name TEXT NOT NULL, + type INTEGER NOT NULL, + color INTEGER NOT NULL, + PRIMARY KEY(profileId, id))""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration63.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration63.kt new file mode 100644 index 00000000..659af38d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration63.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration63 : Migration(62, 63) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE profiles ADD COLUMN accountNameLong TEXT DEFAULT NULL") + database.execSQL("ALTER TABLE profiles ADD COLUMN studentClassName TEXT DEFAULT NULL") + database.execSQL("ALTER TABLE profiles ADD COLUMN studentSchoolYear TEXT DEFAULT NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration64.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration64.kt new file mode 100644 index 00000000..fba1d2c7 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration64.kt @@ -0,0 +1,37 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration64 : Migration(63, 64) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE timetable ( + profileId INTEGER NOT NULL, + id INTEGER NOT NULL, + type INTEGER NOT NULL, + date TEXT DEFAULT NULL, + lessonNumber INTEGER DEFAULT NULL, + startTime TEXT DEFAULT NULL, + endTime TEXT DEFAULT NULL, + subjectId INTEGER DEFAULT NULL, + teacherId INTEGER DEFAULT NULL, + teamId INTEGER DEFAULT NULL, + classroom TEXT DEFAULT NULL, + oldDate TEXT DEFAULT NULL, + oldLessonNumber INTEGER DEFAULT NULL, + oldStartTime TEXT DEFAULT NULL, + oldEndTime TEXT DEFAULT NULL, + oldSubjectId INTEGER DEFAULT NULL, + oldTeacherId INTEGER DEFAULT NULL, + oldTeamId INTEGER DEFAULT NULL, + oldClassroom TEXT DEFAULT NULL, + PRIMARY KEY(id))""") + + database.execSQL("CREATE INDEX index_lessons_profileId_type_date ON timetable (profileId, type, date)") + database.execSQL("CREATE INDEX index_lessons_profileId_type_oldDate ON timetable (profileId, type, oldDate)") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration65.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration65.kt new file mode 100644 index 00000000..8c432f82 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration65.kt @@ -0,0 +1,18 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration65 : Migration(64, 65) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE config ( + profileId INTEGER NOT NULL DEFAULT -1, + `key` TEXT NOT NULL, + value TEXT NOT NULL, + PRIMARY KEY(profileId, `key`))""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration66.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration66.kt new file mode 100644 index 00000000..31ab6bdb --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration66.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration66 : Migration(65, 66) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("DROP TABLE config;") + database.execSQL("""CREATE TABLE config ( + profileId INTEGER NOT NULL DEFAULT -1, + `key` TEXT NOT NULL, + value TEXT, + PRIMARY KEY(profileId, `key`))""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration67.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration67.kt new file mode 100644 index 00000000..e64d63bf --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration67.kt @@ -0,0 +1,34 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration67 : Migration(66, 67) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("DELETE FROM grades WHERE (gradeId=-1 OR gradeId=-2) AND gradeType=20") + database.execSQL("DELETE FROM metadata WHERE (thingId=-1 OR thingId=-2) AND thingType=1") + database.execSQL("ALTER TABLE gradeCategories RENAME TO _gradeCategories") + + database.execSQL("""CREATE TABLE gradeCategories ( + profileId INTEGER NOT NULL, + categoryId INTEGER NOT NULL, + weight REAL NOT NULL, + color INTEGER NOT NULL, + `text` TEXT, + columns TEXT, + valueFrom REAL NOT NULL, + valueTo REAL NOT NULL, + type INTEGER NOT NULL, + PRIMARY KEY(profileId, categoryId, type))""") + + database.execSQL("""INSERT INTO gradeCategories (profileId, categoryId, weight, color, + `text`, columns, valueFrom, valueTo, type) + SELECT profileId, categoryId, weight, color, `text`, columns, valueFrom, + valueTo, type FROM _gradeCategories""") + database.execSQL("DROP TABLE _gradeCategories") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration68.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration68.kt new file mode 100644 index 00000000..f7a079d0 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration68.kt @@ -0,0 +1,17 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase +import pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_ANNOUNCEMENT + +class Migration68 : Migration(67, 68) { + override fun migrate(database: SupportSQLiteDatabase) { + /* Migration from crc16 to crc32 id */ + database.execSQL("DELETE FROM announcements") + database.execSQL("DELETE FROM metadata WHERE thingType=$TYPE_ANNOUNCEMENT") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration69.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration69.kt new file mode 100644 index 00000000..1fd6760d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration69.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration69 : Migration(68, 69) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE loginStores ADD COLUMN loginStoreMode INTEGER NOT NULL DEFAULT 0") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration70.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration70.kt new file mode 100644 index 00000000..1696301d --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration70.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration70 : Migration(69, 70) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE announcements ADD COLUMN announcementIdString TEXT DEFAULT NULL") + database.execSQL("DELETE FROM announcements") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration71.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration71.kt new file mode 100644 index 00000000..dabb2303 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration71.kt @@ -0,0 +1,22 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase +import pl.szczodrzynski.edziennik.data.db.entity.Metadata.TYPE_MESSAGE + +class Migration71 : Migration(70, 71) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("DELETE FROM messages WHERE profileId IN (SELECT profileId FROM profiles WHERE archived = 0)") + database.execSQL("DELETE FROM messageRecipients WHERE profileId IN (SELECT profileId FROM profiles WHERE archived = 0)") + database.execSQL("DELETE FROM teachers WHERE profileId IN (SELECT profileId FROM profiles WHERE archived = 0)") + database.execSQL("DELETE FROM endpointTimers WHERE profileId IN (SELECT profileId FROM profiles WHERE archived = 0)") + database.execSQL("DELETE FROM metadata WHERE profileId IN (SELECT profileId FROM profiles WHERE archived = 0) AND thingType = $TYPE_MESSAGE") + database.execSQL("UPDATE profiles SET empty = 1 WHERE archived = 0") + database.execSQL("UPDATE profiles SET lastReceiversSync = 0 WHERE archived = 0") + database.execSQL("INSERT INTO config (profileId, `key`, value) VALUES (-1, 'runSync', 'true')") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration72.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration72.kt new file mode 100644 index 00000000..88567b47 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration72.kt @@ -0,0 +1,138 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase +import pl.szczodrzynski.edziennik.crc32 + +class Migration72 : Migration(71, 72) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE loginStores RENAME to _loginStores;") + database.execSQL("""CREATE TABLE loginStores( + loginStoreId INTEGER NOT NULL, + loginStoreType INTEGER NOT NULL, + loginStoreMode INTEGER NOT NULL, + loginStoreData TEXT NOT NULL, + PRIMARY KEY(loginStoreId))""") + + database.execSQL("""INSERT INTO loginStores + (loginStoreId, loginStoreType, loginStoreMode, loginStoreData) + SELECT loginStoreId, loginStoreType, loginStoreMode, loginStoreData + FROM _loginStores""") + + database.execSQL("DROP TABLE _loginStores;") + database.execSQL("ALTER TABLE profiles RENAME TO _profiles_old;") + + database.execSQL("""CREATE TABLE profiles ( + profileId INTEGER NOT NULL, name TEXT NOT NULL, subname TEXT, image TEXT DEFAULT NULL, + studentNameLong TEXT NOT NULL, studentNameShort TEXT NOT NULL, accountName TEXT, + studentData TEXT NOT NULL, empty INTEGER NOT NULL DEFAULT 1, archived INTEGER NOT NULL DEFAULT 0, + syncEnabled INTEGER NOT NULL DEFAULT 1, enableSharedEvents INTEGER NOT NULL DEFAULT 1, registration INTEGER NOT NULL DEFAULT 0, + userCode TEXT NOT NULL DEFAULT '', studentNumber INTEGER NOT NULL DEFAULT -1, studentClassName TEXT DEFAULT NULL, + studentSchoolYearStart INTEGER NOT NULL, dateSemester1Start TEXT NOT NULL, dateSemester2Start TEXT NOT NULL, + dateYearEnd TEXT NOT NULL, disabledNotifications TEXT DEFAULT NULL, lastReceiversSync INTEGER NOT NULL DEFAULT 0, + loginStoreId INTEGER NOT NULL, loginStoreType INTEGER NOT NULL, PRIMARY KEY(profileId))""") + + database.execSQL("""INSERT INTO profiles (profileId, name, subname, image, studentNameLong, studentNameShort, accountName, + userCode, studentData, empty, archived, syncEnabled, enableSharedEvents, registration, studentNumber, studentSchoolYearStart, + dateSemester1Start, dateSemester2Start, dateYearEnd, lastReceiversSync, loginStoreId, loginStoreType) + SELECT profileId, name, subname, image, studentNameLong, studentNameShort, accountNameLong, '' AS userCode, studentData, + empty, archived, syncEnabled, enableSharedEvents, registration, studentNumber, SUBSTR(dateSemester1Start, 0, 5) AS studentSchoolYearStart, + dateSemester1Start, dateSemester2Start, dateYearEnd, lastReceiversSync, _profiles_old.loginStoreId, loginStoreType FROM _profiles_old + JOIN loginStores ON loginStores.loginStoreId = _profiles_old.loginStoreId WHERE profileId >= 0""") + + database.execSQL("DROP TABLE _profiles_old;") + + migrateUserCodes(database) + } + + private fun migrateMobidziennik(database: SupportSQLiteDatabase) { + database.execSQL("DROP TABLE IF EXISTS _userCodes;") + database.execSQL("CREATE TABLE _userCodes (profileId INTEGER, loginData TEXT, studentData TEXT, userCode TEXT, serverName TEXT, username TEXT, studentId TEXT);") + database.execSQL("DELETE FROM _userCodes;") + database.execSQL("INSERT INTO _userCodes SELECT profileId, loginStores.loginStoreData, studentData, \"\", \"\", \"\", \"\" FROM profiles JOIN loginStores ON loginStores.loginStoreId = profiles.loginStoreId WHERE profiles.loginStoreType = 1;") + database.execSQL("UPDATE _userCodes SET serverName = SUBSTR(loginData, instr(loginData, '\"serverName\":\"')+14);") + database.execSQL("UPDATE _userCodes SET serverName = SUBSTR(serverName, 0, instr(serverName, '\",')+instr(serverName, '\"}')-(instr(serverName, '\"}')*min(instr(serverName, '\",'), 1)));") + database.execSQL("UPDATE _userCodes SET username = SUBSTR(loginData, instr(loginData, '\"username\":\"')+12);") + database.execSQL("UPDATE _userCodes SET username = SUBSTR(username, 0, instr(username, '\",')+instr(username, '\"}')-(instr(username, '\"}')*min(instr(username, '\",'), 1)));") + database.execSQL("UPDATE _userCodes SET studentId = SUBSTR(studentData, instr(studentData, '\"studentId\":')+12);") + database.execSQL("UPDATE _userCodes SET studentId = SUBSTR(studentId, 0, instr(studentId, ',')+instr(studentId, '}')-(instr(studentId, '}')*min(instr(studentId, ','), 1)));") + database.execSQL("UPDATE _userCodes SET userCode = serverName||\":\"||username||\":\"||studentId;") + database.execSQL("UPDATE profiles SET userCode = (SELECT userCode FROM _userCodes WHERE profileId = profiles.profileId) WHERE profileId IN (SELECT profileId FROM _userCodes);") + } + + private fun migrateLibrus(database: SupportSQLiteDatabase) { + database.execSQL("DROP TABLE IF EXISTS _userCodes;") + database.execSQL("CREATE TABLE _userCodes (profileId INTEGER, loginData TEXT, studentData TEXT, userCode TEXT, schoolName TEXT, accountLogin TEXT);") + database.execSQL("DELETE FROM _userCodes;") + database.execSQL("INSERT INTO _userCodes SELECT profileId, loginStores.loginStoreData, studentData, \"\", \"\", \"\" FROM profiles JOIN loginStores ON loginStores.loginStoreId = profiles.loginStoreId WHERE profiles.loginStoreType = 2;") + database.execSQL("UPDATE _userCodes SET schoolName = SUBSTR(studentData, instr(studentData, '\"schoolName\":\"')+14);") + database.execSQL("UPDATE _userCodes SET schoolName = SUBSTR(schoolName, 0, instr(schoolName, '\",')+instr(schoolName, '\"}')-(instr(schoolName, '\"}')*min(instr(schoolName, '\",'), 1)));") + database.execSQL("UPDATE _userCodes SET accountLogin = SUBSTR(studentData, instr(studentData, '\"accountLogin\":\"')+16);") + database.execSQL("UPDATE _userCodes SET accountLogin = SUBSTR(accountLogin, 0, instr(accountLogin, '\",')+instr(accountLogin, '\"}')-(instr(accountLogin, '\"}')*min(instr(accountLogin, '\",'), 1)));") + database.execSQL("UPDATE _userCodes SET userCode = schoolName||\":\"||accountLogin;") + database.execSQL("UPDATE profiles SET userCode = (SELECT userCode FROM _userCodes WHERE profileId = profiles.profileId) WHERE profileId IN (SELECT profileId FROM _userCodes);") + } + + private fun migrateIUczniowie(database: SupportSQLiteDatabase) { + database.execSQL("DROP TABLE IF EXISTS _userCodes;") + database.execSQL("CREATE TABLE _userCodes (profileId INTEGER, loginData TEXT, studentData TEXT, userCode TEXT, schoolName TEXT, username TEXT, registerId TEXT);") + database.execSQL("DELETE FROM _userCodes;") + database.execSQL("INSERT INTO _userCodes SELECT profileId, loginStores.loginStoreData, studentData, \"\", \"\", \"\", \"\" FROM profiles JOIN loginStores ON loginStores.loginStoreId = profiles.loginStoreId WHERE profiles.loginStoreType = 3;") + database.execSQL("UPDATE _userCodes SET schoolName = SUBSTR(loginData, instr(loginData, '\"schoolName\":\"')+14);") + database.execSQL("UPDATE _userCodes SET schoolName = SUBSTR(schoolName, 0, instr(schoolName, '\",')+instr(schoolName, '\"}')-(instr(schoolName, '\"}')*min(instr(schoolName, '\",'), 1)));") + database.execSQL("UPDATE _userCodes SET username = SUBSTR(loginData, instr(loginData, '\"username\":\"')+12);") + database.execSQL("UPDATE _userCodes SET username = SUBSTR(username, 0, instr(username, '\",')+instr(username, '\"}')-(instr(username, '\"}')*min(instr(username, '\",'), 1)));") + database.execSQL("UPDATE _userCodes SET registerId = SUBSTR(studentData, instr(studentData, '\"registerId\":')+13);") + database.execSQL("UPDATE _userCodes SET registerId = SUBSTR(registerId, 0, instr(registerId, ',')+instr(registerId, '}')-(instr(registerId, '}')*min(instr(registerId, ','), 1)));") + database.execSQL("UPDATE _userCodes SET userCode = schoolName||\":\"||username||\":\"||registerId;") + database.execSQL("UPDATE profiles SET userCode = (SELECT userCode FROM _userCodes WHERE profileId = profiles.profileId) WHERE profileId IN (SELECT profileId FROM _userCodes);") + } + + private fun migrateVulcan(database: SupportSQLiteDatabase) { + database.execSQL("DROP TABLE IF EXISTS _userCodes;") + database.execSQL("CREATE TABLE _userCodes (profileId INTEGER, loginData TEXT, studentData TEXT, userCode TEXT, schoolName TEXT, studentId TEXT);") + database.execSQL("DELETE FROM _userCodes;") + database.execSQL("INSERT INTO _userCodes SELECT profileId, loginStores.loginStoreData, studentData, \"\", \"\", \"\" FROM profiles JOIN loginStores ON loginStores.loginStoreId = profiles.loginStoreId WHERE profiles.loginStoreType = 4;") + database.execSQL("UPDATE _userCodes SET schoolName = SUBSTR(studentData, instr(studentData, '\"schoolName\":\"')+14);") + database.execSQL("UPDATE _userCodes SET schoolName = SUBSTR(schoolName, 0, instr(schoolName, '\",')+instr(schoolName, '\"}')-(instr(schoolName, '\"}')*min(instr(schoolName, '\",'), 1)));") + database.execSQL("UPDATE _userCodes SET studentId = SUBSTR(studentData, instr(studentData, '\"studentId\":')+12);") + database.execSQL("UPDATE _userCodes SET studentId = SUBSTR(studentId, 0, instr(studentId, ',')+instr(studentId, '}')-(instr(studentId, '}')*min(instr(studentId, ','), 1)));") + database.execSQL("UPDATE _userCodes SET userCode = schoolName||\":\"||studentId;") + database.execSQL("UPDATE profiles SET userCode = (SELECT userCode FROM _userCodes WHERE profileId = profiles.profileId) WHERE profileId IN (SELECT profileId FROM _userCodes);") + } + + private fun migrateEdudziennik(database: SupportSQLiteDatabase) { + database.execSQL("DROP TABLE IF EXISTS _userCodes;") + database.execSQL("CREATE TABLE _userCodes (profileId INTEGER, loginData TEXT, studentData TEXT, userCode TEXT, schoolName TEXT, email TEXT, studentId TEXT);") + database.execSQL("DELETE FROM _userCodes;") + database.execSQL("INSERT INTO _userCodes SELECT profileId, loginStores.loginStoreData, studentData, \"\", \"\", \"\", \"\" FROM profiles JOIN loginStores ON loginStores.loginStoreId = profiles.loginStoreId WHERE profiles.loginStoreType = 5;") + database.execSQL("UPDATE _userCodes SET schoolName = SUBSTR(studentData, instr(studentData, '\"schoolName\":\"')+14);") + database.execSQL("UPDATE _userCodes SET schoolName = SUBSTR(schoolName, 0, instr(schoolName, '\",')+instr(schoolName, '\"}')-(instr(schoolName, '\"}')*min(instr(schoolName, '\",'), 1)));") + database.execSQL("UPDATE _userCodes SET email = SUBSTR(loginData, instr(loginData, '\"email\":\"')+9);") + database.execSQL("UPDATE _userCodes SET email = SUBSTR(email, 0, instr(email, '\",')+instr(email, '\"}')-(instr(email, '\"}')*min(instr(email, '\",'), 1)));") + database.execSQL("UPDATE _userCodes SET studentId = SUBSTR(studentData, instr(studentData, '\"studentId\":\"')+13);") + database.execSQL("UPDATE _userCodes SET studentId = SUBSTR(studentId, 0, instr(studentId, '\",')+instr(studentId, '\"}')-(instr(studentId, '\"}')*min(instr(studentId, '\",'), 1)));") + database.query("SELECT profileId, studentId FROM _userCodes;").use { cursor -> + while (cursor.moveToNext()) { + val profileId = cursor.getInt(0) + val crc = cursor.getString(1).crc32() + database.execSQL("UPDATE _userCodes SET studentId = $crc WHERE profileId = $profileId") + } + } + database.execSQL("UPDATE _userCodes SET userCode = schoolName||\":\"||email||\":\"||studentId;") + database.execSQL("UPDATE profiles SET userCode = (SELECT userCode FROM _userCodes WHERE profileId = profiles.profileId) WHERE profileId IN (SELECT profileId FROM _userCodes);") + database.execSQL("DROP TABLE _userCodes;") + } + + private fun migrateUserCodes(database: SupportSQLiteDatabase) { + migrateMobidziennik(database) + migrateLibrus(database) + migrateVulcan(database) + migrateIUczniowie(database) + migrateEdudziennik(database) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration73.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration73.kt new file mode 100644 index 00000000..cb8e29e8 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration73.kt @@ -0,0 +1,16 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration73 : Migration(72, 73) { + override fun migrate(database: SupportSQLiteDatabase) { // Mark as seen all lucky number metadata. + database.execSQL("UPDATE metadata SET seen=1 WHERE thingType=10") + database.execSQL("DROP TABLE lessons") + database.execSQL("DROP TABLE lessonChanges") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration74.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration74.kt new file mode 100644 index 00000000..1be5c212 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration74.kt @@ -0,0 +1,22 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration74 : Migration(73, 74) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("""CREATE TABLE librusLessons ( + profileId INTEGER NOT NULL, + lessonId INTEGER NOT NULL, + teacherId INTEGER NOT NULL, + subjectId INTEGER NOT NULL, + teamId INTEGER, + PRIMARY KEY(profileId, lessonId))""") + + database.execSQL("CREATE INDEX index_librusLessons_profileId ON librusLessons (profileId)") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration75.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration75.kt new file mode 100644 index 00000000..ed558115 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration75.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration75 : Migration(74, 75) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE timetable RENAME TO _timetable") + database.execSQL("CREATE TABLE timetable (profileId INTEGER NOT NULL,id INTEGER NOT NULL,type INTEGER NOT NULL,date TEXT DEFAULT NULL,lessonNumber INTEGER DEFAULT NULL,startTime TEXT DEFAULT NULL,endTime TEXT DEFAULT NULL,subjectId INTEGER DEFAULT NULL,teacherId INTEGER DEFAULT NULL,teamId INTEGER DEFAULT NULL,classroom TEXT DEFAULT NULL,oldDate TEXT DEFAULT NULL,oldLessonNumber INTEGER DEFAULT NULL,oldStartTime TEXT DEFAULT NULL,oldEndTime TEXT DEFAULT NULL,oldSubjectId INTEGER DEFAULT NULL,oldTeacherId INTEGER DEFAULT NULL,oldTeamId INTEGER DEFAULT NULL,oldClassroom TEXT DEFAULT NULL,PRIMARY KEY(profileId, id))") + database.execSQL("INSERT INTO timetable (profileId, id, type, date, lessonNumber, startTime, endTime, subjectId, teacherId, teamId, classroom, oldDate, oldLessonNumber, oldStartTime, oldEndTime, oldSubjectId, oldTeacherId, oldTeamId, oldClassroom) SELECT profileId, id, type, date, lessonNumber, startTime, endTime, subjectId, teacherId, teamId, classroom, oldDate, oldLessonNumber, oldStartTime, oldEndTime, oldSubjectId, oldTeacherId, oldTeamId, oldClassroom FROM _timetable") + database.execSQL("DROP TABLE _timetable") + database.execSQL("CREATE INDEX index_lessons_profileId_type_date ON timetable (profileId, type, date)") + database.execSQL("CREATE INDEX index_lessons_profileId_type_oldDate ON timetable (profileId, type, oldDate)") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration76.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration76.kt new file mode 100644 index 00000000..a8d5bf1b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration76.kt @@ -0,0 +1,34 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2020-1-25 + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration76 : Migration(75, 76) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE feedbackMessages RENAME TO _feedbackMessages;") + database.execSQL("""CREATE TABLE feedbackMessages ( + messageId INTEGER NOT NULL PRIMARY KEY, + received INTEGER NOT NULL, + text TEXT NOT NULL, + senderName TEXT NOT NULL, + deviceId TEXT DEFAULT NULL, + deviceName TEXT DEFAULT NULL, + devId INTEGER DEFAULT NULL, + devImage TEXT DEFAULT NULL, + sentTime INTEGER NOT NULL);""") + database.execSQL("""INSERT INTO feedbackMessages (messageId, received, text, senderName, deviceId, deviceName, devId, devImage, sentTime) + SELECT messageId, received, text, + CASE fromUser IS NOT NULL WHEN 1 THEN CASE fromUserName IS NULL WHEN 1 THEN "" ELSE fromUserName END ELSE "" END AS senderName, + fromUser AS deviceId, + NULL AS deviceName, + CASE received AND fromUser IS NULL WHEN 1 THEN 100 ELSE NULL END AS devId, + NULL AS devImage, + sentTime + FROM _feedbackMessages;""") + database.execSQL("DROP TABLE _feedbackMessages;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration77.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration77.kt new file mode 100644 index 00000000..f0b083a0 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration77.kt @@ -0,0 +1,19 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-2-19. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration77 : Migration(76, 77) { + override fun migrate(database: SupportSQLiteDatabase) { + // mobidziennik web attendance implementation: + // delete all attendance from mobidziennik profiles + // (ID conflict/duplicated items - no ID in HTML of the website) + database.execSQL("DELETE FROM attendances WHERE profileId IN (SELECT profileId FROM profiles WHERE loginStoreType = 1 AND archived = 0);") + // mark the web attendance endpoint to force sync + database.execSQL("DELETE FROM endpointTimers WHERE endpointId = 2050;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration78.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration78.kt new file mode 100644 index 00000000..584472fd --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration78.kt @@ -0,0 +1,44 @@ +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration78 : Migration(77, 78) { + override fun migrate(database: SupportSQLiteDatabase) { + // grades migration to kotlin + database.execSQL("ALTER TABLE grades RENAME TO _grades;") + database.execSQL("""CREATE TABLE grades ( + profileId INTEGER NOT NULL, + gradeId INTEGER NOT NULL, + gradeName TEXT NOT NULL, + gradeType INTEGER NOT NULL, + gradeValue REAL NOT NULL, + gradeWeight REAL NOT NULL, + gradeColor INTEGER NOT NULL, + gradeCategory TEXT, + gradeDescription TEXT, + gradeComment TEXT, + gradeSemester INTEGER NOT NULL, + teacherId INTEGER NOT NULL, + subjectId INTEGER NOT NULL, + gradeValueMax REAL DEFAULT NULL, + gradeClassAverage REAL DEFAULT NULL, + gradeParentId INTEGER DEFAULT NULL, + gradeIsImprovement INTEGER NOT NULL, + PRIMARY KEY(profileId, gradeId) + );""") + database.execSQL("DROP INDEX IF EXISTS index_grades_profileId;") + database.execSQL("CREATE INDEX index_grades_profileId ON grades (profileId);") + database.execSQL("""INSERT INTO grades (profileId, gradeId, gradeName, gradeType, gradeValue, gradeWeight, gradeColor, gradeCategory, gradeDescription, gradeComment, gradeSemester, teacherId, subjectId, gradeValueMax, gradeClassAverage, gradeParentId, gradeIsImprovement) + SELECT profileId, gradeId, gradeName, gradeType, gradeValue, gradeWeight, gradeColor, + CASE gradeCategory WHEN '' THEN NULL WHEN ' ' THEN NULL ELSE gradeCategory END, + CASE gradeDescription WHEN '' THEN NULL WHEN ' ' THEN NULL ELSE gradeDescription END, + CASE gradeComment WHEN '' THEN NULL WHEN ' ' THEN NULL ELSE gradeComment END, + gradeSemester, teacherId, subjectId, + CASE gradeValueMax WHEN 0 THEN NULL ELSE gradeValueMax END, + CASE gradeClassAverage WHEN -1 THEN NULL ELSE gradeClassAverage END, + CASE gradeParentId WHEN -1 THEN NULL ELSE gradeParentId END, + gradeIsImprovement FROM _grades;""") + database.execSQL("DROP TABLE _grades;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration79.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration79.kt new file mode 100644 index 00000000..c078b865 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration79.kt @@ -0,0 +1,27 @@ +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration79 : Migration(78, 79) { + override fun migrate(database: SupportSQLiteDatabase) { + // manual timetable implementation + database.execSQL("""CREATE TABLE timetableManual ( + profileId INTEGER NOT NULL, + id INTEGER PRIMARY KEY NOT NULL, + type INTEGER NOT NULL, + repeatBy INTEGER NOT NULL DEFAULT 0, + date INTEGER DEFAULT NULL, + weekDay INTEGER DEFAULT NULL, + lessonNumber INTEGER DEFAULT NULL, + startTime TEXT DEFAULT NULL, + endTime TEXT DEFAULT NULL, + subjectId INTEGER DEFAULT NULL, + teacherId INTEGER DEFAULT NULL, + teamId INTEGER DEFAULT NULL, + classroom TEXT DEFAULT NULL + )""") + database.execSQL("CREATE INDEX index_timetableManual_profileId_date ON timetableManual (profileId, date)") + database.execSQL("CREATE INDEX index_timetableManual_profileId_weekDay ON timetableManual (profileId, weekDay)") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration80.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration80.kt new file mode 100644 index 00000000..86394792 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration80.kt @@ -0,0 +1,48 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-3-27. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration80 : Migration(79, 80) { + override fun migrate(database: SupportSQLiteDatabase) { + // The Homework Update + database.execSQL("ALTER TABLE events RENAME TO _events;") + database.execSQL("""CREATE TABLE events ( + profileId INTEGER NOT NULL, + eventId INTEGER NOT NULL, + eventDate TEXT NOT NULL, + eventTime TEXT, + eventTopic TEXT NOT NULL, + eventColor INTEGER, + eventType INTEGER NOT NULL, + teacherId INTEGER NOT NULL, + subjectId INTEGER NOT NULL, + teamId INTEGER NOT NULL, + eventAddedManually INTEGER NOT NULL DEFAULT 0, + eventSharedBy TEXT DEFAULT NULL, + eventSharedByName TEXT DEFAULT NULL, + eventBlacklisted INTEGER NOT NULL DEFAULT 0, + homeworkBody TEXT DEFAULT NULL, + attachmentIds TEXT DEFAULT NULL, + attachmentNames TEXT DEFAULT NULL, + PRIMARY KEY(profileId, eventId) + )""") + database.execSQL("DROP INDEX IF EXISTS index_events_profileId_eventDate_eventStartTime") + database.execSQL("DROP INDEX IF EXISTS index_events_profileId_eventType") + database.execSQL("CREATE INDEX index_events_profileId_eventDate_eventTime ON events (profileId, eventDate, eventTime)") + database.execSQL("CREATE INDEX index_events_profileId_eventType ON events (profileId, eventType)") + database.execSQL(""" + INSERT INTO events (profileId, eventId, eventDate, eventTime, eventTopic, eventColor, eventType, teacherId, subjectId, teamId, eventAddedManually, eventSharedBy, eventSharedByName, eventBlacklisted) + SELECT profileId, eventId, eventDate, eventStartTime, eventTopic, + CASE eventColor WHEN -1 THEN NULL ELSE eventColor END, + eventType, teacherId, subjectId, teamId, + eventAddedManually, eventSharedBy, eventSharedByName, eventBlacklisted + FROM _events + """) + database.execSQL("DROP TABLE _events") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration81.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration81.kt new file mode 100644 index 00000000..bf547244 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration81.kt @@ -0,0 +1,11 @@ +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase +import pl.szczodrzynski.edziennik.data.db.entity.Metadata + +class Migration81 : Migration(80, 81) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("UPDATE metadata SET seen = 1, notified = 1 WHERE thingType = ${Metadata.TYPE_TEACHER_ABSENCE}") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration82.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration82.kt new file mode 100644 index 00000000..b0e1c769 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration82.kt @@ -0,0 +1,10 @@ +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration82 : Migration(81, 82) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE events ADD COLUMN eventIsDone INTEGER DEFAULT 0 NOT NULL") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration83.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration83.kt new file mode 100644 index 00000000..340d5768 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration83.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-3-30. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration83 : Migration(82, 83) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE events ADD COLUMN keep INTEGER NOT NULL DEFAULT 1") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration84.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration84.kt new file mode 100644 index 00000000..67ae8dbc --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration84.kt @@ -0,0 +1,40 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-4. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration84 : Migration(83, 84) { + override fun migrate(database: SupportSQLiteDatabase) { + // The Message Update + database.execSQL("ALTER TABLE messages RENAME TO _messages;") + database.execSQL("""CREATE TABLE messages ( + profileId INTEGER NOT NULL, + messageId INTEGER NOT NULL, + messageType INTEGER NOT NULL, + messageSubject TEXT NOT NULL, + messageBody TEXT, + senderId INTEGER, + messageIsPinned INTEGER NOT NULL DEFAULT 0, + hasAttachments INTEGER NOT NULL DEFAULT 0, + attachmentIds TEXT DEFAULT NULL, + attachmentNames TEXT DEFAULT NULL, + attachmentSizes TEXT DEFAULT NULL, + keep INTEGER NOT NULL DEFAULT 1, + PRIMARY KEY(profileId, messageId) + )""") + database.execSQL("DROP INDEX IF EXISTS index_messages_profileId") + database.execSQL("CREATE INDEX index_messages_profileId_messageType ON messages (profileId, messageType)") + database.execSQL(""" + INSERT INTO messages (profileId, messageId, messageType, messageSubject, messageBody, senderId, hasAttachments, attachmentIds, attachmentNames, attachmentSizes) + SELECT profileId, messageId, messageType, messageSubject, messageBody, + CASE senderId WHEN -1 THEN NULL ELSE senderId END, + overrideHasAttachments, attachmentIds, attachmentNames, attachmentSizes + FROM _messages + """) + database.execSQL("DROP TABLE _messages") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration85.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration85.kt new file mode 100644 index 00000000..6f1c79c0 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration85.kt @@ -0,0 +1,12 @@ +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_EDUDZIENNIK +import pl.szczodrzynski.edziennik.data.db.entity.Event + +class Migration85 : Migration(84, 85) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("DELETE FROM events WHERE eventAddedManually = 0 AND eventType = ${Event.TYPE_HOMEWORK} AND profileId IN (SELECT profileId FROM (SELECT profileId FROM profiles WHERE loginStoreType = $LOGIN_TYPE_EDUDZIENNIK) x)") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration86.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration86.kt new file mode 100644 index 00000000..add43d71 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration86.kt @@ -0,0 +1,178 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-4-29. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration86 : Migration(85, 86) { + override fun migrate(database: SupportSQLiteDatabase) { + // Migrating some models, moving addedDate from metadata to entities + + // Announcements + database.execSQL("""ALTER TABLE announcements RENAME TO _announcements""") + database.execSQL("""CREATE TABLE `announcements` ( + `announcementIdString` TEXT, + `profileId` INTEGER NOT NULL, + `announcementId` INTEGER NOT NULL, + `announcementSubject` TEXT NOT NULL, + `announcementText` TEXT, + `announcementStartDate` TEXT, + `announcementEndDate` TEXT, + `teacherId` INTEGER NOT NULL, + `addedDate` INTEGER NOT NULL, + `keep` INTEGER NOT NULL, + PRIMARY KEY(`profileId`, `announcementId`) + )""") + database.execSQL("""DROP INDEX IF EXISTS index_announcements_profileId""") + database.execSQL("""CREATE INDEX `index_announcements_profileId` ON `announcements` (`profileId`)""") + database.execSQL("""REPLACE INTO announcements ( + announcementIdString, profileId, announcementId, announcementSubject, announcementText, announcementStartDate, announcementEndDate, teacherId, addedDate, keep + ) SELECT + announcementIdString, profileId, announcementId, IFNULL(announcementSubject, ""), announcementText, announcementStartDate, announcementEndDate, teacherId, 0, 1 + FROM _announcements""") + database.execSQL("""DROP TABLE _announcements""") + + // Attendance Types + database.execSQL("""ALTER TABLE attendanceTypes RENAME TO _attendanceTypes""") + database.execSQL("""CREATE TABLE `attendanceTypes` ( + `profileId` INTEGER NOT NULL, + `id` INTEGER NOT NULL, + `baseType` INTEGER NOT NULL, + `typeName` TEXT NOT NULL, + `typeShort` TEXT NOT NULL, + `typeSymbol` TEXT NOT NULL, + `typeColor` INTEGER, + PRIMARY KEY(`profileId`, `id`) + )""") + database.execSQL("""REPLACE INTO attendanceTypes ( + profileId, id, + baseType, + typeName, + typeShort, + typeSymbol, + typeColor + ) SELECT + profileId, id, + CASE WHEN id > 100 AND type = 0 THEN 10 ELSE type END, + name, + CASE type WHEN 0 THEN "ob" WHEN 1 THEN "nb" WHEN 2 THEN "u" WHEN 3 THEN "zw" WHEN 4 THEN "sp" WHEN 5 THEN "su" WHEN 6 THEN "w" ELSE "?" END, + CASE type WHEN 0 THEN "ob" WHEN 1 THEN "nb" WHEN 2 THEN "u" WHEN 3 THEN "zw" WHEN 4 THEN "sp" WHEN 5 THEN "su" WHEN 6 THEN "w" ELSE "?" END, + CASE color WHEN -1 THEN NULL ELSE color END + FROM _attendanceTypes""") + database.execSQL("""DROP TABLE _attendanceTypes""") + + // Attendance + database.execSQL("""ALTER TABLE attendances RENAME TO _attendances""") + database.execSQL("""CREATE TABLE `attendances` ( + `attendanceLessonTopic` TEXT, + `attendanceLessonNumber` INTEGER, + `profileId` INTEGER NOT NULL, + `attendanceId` INTEGER NOT NULL, + `attendanceBaseType` INTEGER NOT NULL, + `attendanceTypeName` TEXT NOT NULL, + `attendanceTypeShort` TEXT NOT NULL, + `attendanceTypeSymbol` TEXT NOT NULL, + `attendanceTypeColor` INTEGER, + `attendanceDate` TEXT NOT NULL, + `attendanceTime` TEXT, + `attendanceSemester` INTEGER NOT NULL, + `teacherId` INTEGER NOT NULL, + `subjectId` INTEGER NOT NULL, + `addedDate` INTEGER NOT NULL, + `keep` INTEGER NOT NULL, + PRIMARY KEY(`profileId`, `attendanceId`) + )""") + database.execSQL("""DROP INDEX IF EXISTS index_attendances_profileId""") + database.execSQL("""CREATE INDEX `index_attendances_profileId` ON `attendances` (`profileId`)""") + database.execSQL("""REPLACE INTO attendances ( + attendanceLessonTopic, attendanceLessonNumber, profileId, attendanceId, + attendanceBaseType, + attendanceTypeName, + attendanceTypeShort, + attendanceTypeSymbol, + attendanceTypeColor, attendanceDate, attendanceTime, attendanceSemester, teacherId, subjectId, addedDate, keep + ) SELECT + attendanceLessonTopic, NULL, profileId, attendanceId, + attendanceType, + CASE attendanceType WHEN 0 THEN "ob" WHEN 1 THEN "nb" WHEN 2 THEN "u" WHEN 3 THEN "zw" WHEN 4 THEN "sp" WHEN 5 THEN "su" WHEN 6 THEN "w" ELSE "?" END, + CASE attendanceType WHEN 0 THEN "ob" WHEN 1 THEN "nb" WHEN 2 THEN "u" WHEN 3 THEN "zw" WHEN 4 THEN "sp" WHEN 5 THEN "su" WHEN 6 THEN "w" ELSE "?" END, + CASE attendanceType WHEN 0 THEN "ob" WHEN 1 THEN "nb" WHEN 2 THEN "u" WHEN 3 THEN "zw" WHEN 4 THEN "sp" WHEN 5 THEN "su" WHEN 6 THEN "w" ELSE "?" END, + NULL, attendanceLessonDate, attendanceStartTime, attendanceSemester, teacherId, subjectId, 0, 1 + FROM _attendances""") + database.execSQL("""DROP TABLE _attendances""") + + // Events + database.execSQL("""ALTER TABLE events ADD COLUMN addedDate INTEGER NOT NULL DEFAULT 0""") + + // Grades + database.execSQL("""ALTER TABLE grades ADD COLUMN addedDate INTEGER NOT NULL DEFAULT 0""") + database.execSQL("""ALTER TABLE grades ADD COLUMN keep INTEGER NOT NULL DEFAULT 1""") + + // Lucky Numbers + database.execSQL("""ALTER TABLE luckyNumbers ADD COLUMN keep INTEGER NOT NULL DEFAULT 1""") + + // Messages + database.execSQL("""ALTER TABLE messages ADD COLUMN addedDate INTEGER NOT NULL DEFAULT 0""") + + // Notices + database.execSQL("""ALTER TABLE notices RENAME TO _notices""") + database.execSQL("""CREATE TABLE `notices` ( + `profileId` INTEGER NOT NULL, + `noticeId` INTEGER NOT NULL, + `noticeType` INTEGER NOT NULL, + `noticeSemester` INTEGER NOT NULL, + `noticeText` TEXT NOT NULL, + `noticeCategory` TEXT, + `noticePoints` REAL, + `teacherId` INTEGER NOT NULL, + `addedDate` INTEGER NOT NULL, + `keep` INTEGER NOT NULL, + PRIMARY KEY(`profileId`, `noticeId`) + )""") + database.execSQL("""DROP INDEX IF EXISTS index_notices_profileId""") + database.execSQL("""CREATE INDEX `index_notices_profileId` ON `notices` (`profileId`)""") + database.execSQL("""REPLACE INTO notices ( + profileId, noticeId, noticeType, noticeSemester, + noticeText, + noticeCategory, + noticePoints, + teacherId, addedDate, keep + ) SELECT + profileId, noticeId, noticeType, noticeSemester, + CASE noticeText WHEN NULL THEN "" ELSE noticeText END, + category, + CASE points WHEN 0 THEN NULL ELSE points END, + teacherId, 0, 1 + FROM _notices""") + database.execSQL("""DROP TABLE _notices""") + + // Teacher Absence + database.execSQL("""ALTER TABLE teacherAbsence ADD COLUMN addedDate INTEGER NOT NULL DEFAULT 0""") + database.execSQL("""ALTER TABLE teacherAbsence ADD COLUMN keep INTEGER NOT NULL DEFAULT 1""") + database.execSQL("""CREATE INDEX IF NOT EXISTS `index_teacherAbsence_profileId` ON `teacherAbsence` (`profileId`)""") + + // Timetable + database.execSQL("""ALTER TABLE timetable ADD COLUMN keep INTEGER NOT NULL DEFAULT 1""") + + // Metadata - copy AddedDate to entities + database.execSQL("""UPDATE grades SET addedDate = IFNULL((SELECT metadata.addedDate FROM metadata WHERE metadata.profileId = grades.profileId AND metadata.thingId = grades.gradeId AND metadata.thingType = 1), 0)""") + database.execSQL("""UPDATE notices SET addedDate = IFNULL((SELECT metadata.addedDate FROM metadata WHERE metadata.profileId = notices.profileId AND metadata.thingId = notices.noticeId AND metadata.thingType = 2), 0)""") + database.execSQL("""UPDATE attendances SET addedDate = IFNULL((SELECT metadata.addedDate FROM metadata WHERE metadata.profileId = attendances.profileId AND metadata.thingId = attendances.attendanceId AND metadata.thingType = 3), 0)""") + database.execSQL("""UPDATE events SET addedDate = IFNULL((SELECT metadata.addedDate FROM metadata WHERE metadata.profileId = events.profileId AND metadata.thingId = events.eventId AND (metadata.thingType = 4 OR metadata.thingType = 5)), 0)""") + database.execSQL("""UPDATE announcements SET addedDate = IFNULL((SELECT metadata.addedDate FROM metadata WHERE metadata.profileId = announcements.profileId AND metadata.thingId = announcements.announcementId AND metadata.thingType = 7), 0)""") + database.execSQL("""UPDATE messages SET addedDate = IFNULL((SELECT metadata.addedDate FROM metadata WHERE metadata.profileId = messages.profileId AND metadata.thingId = messages.messageId AND metadata.thingType = 8), 0)""") + + // Metadata - drop AddedDate column + database.execSQL("""ALTER TABLE metadata RENAME TO _metadata""") + database.execSQL("""CREATE TABLE metadata (profileId INTEGER NOT NULL, metadataId INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, thingType INTEGER NOT NULL, thingId INTEGER NOT NULL, seen INTEGER NOT NULL, notified INTEGER NOT NULL)""") + database.execSQL("""DROP INDEX IF EXISTS index_metadata_profileId_thingType_thingId""") + database.execSQL("""CREATE UNIQUE INDEX index_metadata_profileId_thingType_thingId ON "metadata" (profileId, thingType, thingId)""") + database.execSQL("""INSERT INTO metadata (profileId, metadataId, thingType, thingId, seen, notified) SELECT profileId, metadataId, thingType, thingId, seen, notified FROM _metadata""") + database.execSQL("""DROP TABLE _metadata""") + + database.execSQL("""DELETE FROM endpointTimers WHERE endpointId IN (1080, 1081, 2050, 1090, 1010, 1014);""") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration87.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration87.kt new file mode 100644 index 00000000..524cb559 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration87.kt @@ -0,0 +1,14 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-8. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration87 : Migration(86, 87) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE attendances ADD COLUMN attendanceIsCounted INTEGER NOT NULL DEFAULT 1") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration88.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration88.kt new file mode 100644 index 00000000..0dcd2f8c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration88.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-5-9. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration88 : Migration(87, 88) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("UPDATE endpointTimers SET endpointLastSync = 0 WHERE endpointId IN (1030, 1040, 1050, 1060, 1070, 1080);") + database.execSQL("UPDATE profiles SET empty = 1 WHERE loginStoreType = 4") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration89.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration89.kt new file mode 100644 index 00000000..ce665d1f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration89.kt @@ -0,0 +1,10 @@ +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration89 : Migration(88, 89) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE profiles ADD COLUMN archiveId INTEGER DEFAULT NULL;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration90.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration90.kt new file mode 100644 index 00000000..7b500525 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration90.kt @@ -0,0 +1,30 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-26. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration90 : Migration(89, 90) { + override fun migrate(database: SupportSQLiteDatabase) { + // get all profiles using Vulcan/Hebe + database.execSQL("CREATE TABLE _90_ids (id INTEGER NOT NULL);") + database.execSQL("INSERT INTO _90_ids SELECT profileId FROM profiles JOIN loginStores USING(loginStoreId) WHERE loginStores.loginStoreType = 4 AND loginStores.loginStoreMode != 0;") + + // force full sync when updating from <4.6 + database.execSQL("DELETE FROM endpointTimers WHERE profileId IN (SELECT id FROM _90_ids);") + database.execSQL("UPDATE profiles SET empty = 1 WHERE profileId IN (SELECT id FROM _90_ids);") + // remove messages and events to re-download attachments and remove older than current school year + database.execSQL("DELETE FROM messages WHERE profileId IN (SELECT id FROM _90_ids);") + database.execSQL("DELETE FROM events WHERE profileId IN (SELECT id FROM _90_ids) AND eventAddedManually = 0;") + // remove older data + database.execSQL("DELETE FROM notices WHERE profileId IN (SELECT id FROM _90_ids);") + + // fix for v4.5 users who logged in using Vulcan/Web + database.execSQL("UPDATE loginStores SET loginStoreMode = 2 WHERE loginStoreType = 4 AND loginStoreMode = 1;") + + database.execSQL("DROP TABLE _90_ids;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration91.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration91.kt new file mode 100644 index 00000000..ffb8b093 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration91.kt @@ -0,0 +1,25 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-2-26. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration91 : Migration(90, 91) { + override fun migrate(database: SupportSQLiteDatabase) { + // get all profiles using Vulcan/Hebe + database.execSQL("CREATE TABLE _91_ids (id INTEGER NOT NULL);") + database.execSQL("INSERT INTO _91_ids SELECT profileId FROM profiles JOIN loginStores USING(loginStoreId) WHERE loginStores.loginStoreType = 1;") + + // force attendance sync - mobidziennik + // after enabling counting the e-attendance to statistics + database.execSQL("DELETE FROM endpointTimers WHERE profileId IN (SELECT id FROM _91_ids) AND endpointId = 2050;") + database.execSQL("UPDATE attendances SET attendanceIsCounted = 1 WHERE profileId IN (SELECT id FROM _91_ids);") + database.execSQL("UPDATE attendances SET attendanceBaseType = 2 WHERE profileId IN (SELECT id FROM _91_ids) AND attendanceTypeSymbol = ?;", + arrayOf("+ₑ")) + + database.execSQL("DROP TABLE _91_ids;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration92.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration92.kt new file mode 100644 index 00000000..4b36c0e9 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration92.kt @@ -0,0 +1,60 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-15. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import android.content.ContentValues +import android.database.sqlite.SQLiteDatabase +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.COLOR_ELEARNING +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_ELEARNING +import pl.szczodrzynski.edziennik.data.db.entity.Event.Companion.TYPE_INFORMATION +import pl.szczodrzynski.edziennik.data.db.entity.EventType.Companion.SOURCE_DEFAULT +import pl.szczodrzynski.edziennik.data.db.entity.EventType.Companion.SOURCE_REGISTER +import pl.szczodrzynski.edziennik.getInt + +class Migration92 : Migration(91, 92) { + override fun migrate(database: SupportSQLiteDatabase) { + // make eventTypeName not nullable + database.execSQL("ALTER TABLE eventTypes RENAME TO _eventTypes;") + database.execSQL("CREATE TABLE eventTypes (" + + "profileId INTEGER NOT NULL, " + + "eventType INTEGER NOT NULL, " + + "eventTypeName TEXT NOT NULL, " + + "eventTypeColor INTEGER NOT NULL, " + + "PRIMARY KEY(profileId,eventType)" + + ");") + database.execSQL("INSERT INTO eventTypes " + + "(profileId, eventType, eventTypeName, eventTypeColor) " + + "SELECT profileId, eventType, eventTypeName, eventTypeColor " + + "FROM _eventTypes;") + database.execSQL("DROP TABLE _eventTypes;") + + // add columns for order and source + database.execSQL("ALTER TABLE eventTypes ADD COLUMN eventTypeOrder INTEGER NOT NULL DEFAULT 0;") + database.execSQL("ALTER TABLE eventTypes ADD COLUMN eventTypeSource INTEGER NOT NULL DEFAULT 0;") + + // migrate existing types to show correct order and source + database.execSQL("UPDATE eventTypes SET eventTypeOrder = eventType + 102;") + database.execSQL("UPDATE eventTypes SET eventTypeSource = $SOURCE_REGISTER WHERE eventType > $TYPE_INFORMATION;") + + // add new e-learning type + val cursor = database.query("SELECT profileId FROM profiles;") + cursor.use { + while (it.moveToNext()) { + val values = ContentValues().apply { + put("profileId", it.getInt("profileId")) + put("eventType", TYPE_ELEARNING) + put("eventTypeName", "lekcja online") + put("eventTypeColor", COLOR_ELEARNING) + put("eventTypeOrder", 100) + put("eventTypeSource", SOURCE_DEFAULT) + } + + database.insert("eventTypes", SQLiteDatabase.CONFLICT_REPLACE, values) + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration93.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration93.kt new file mode 100644 index 00000000..9d5df5b3 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/migration/Migration93.kt @@ -0,0 +1,15 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-5-26. + */ + +package pl.szczodrzynski.edziennik.data.db.migration + +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase + +class Migration93 : Migration(92, 93) { + override fun migrate(database: SupportSQLiteDatabase) { + // notifications - long text + database.execSQL("ALTER TABLE notifications ADD COLUMN textLong TEXT DEFAULT NULL;") + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/announcements/Announcement.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/announcements/Announcement.java deleted file mode 100644 index 49ba227c..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/announcements/Announcement.java +++ /dev/null @@ -1,47 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.announcements; - -import androidx.annotation.Nullable; -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; -import androidx.room.Index; -import pl.szczodrzynski.edziennik.utils.models.Date; - -@Entity(tableName = "announcements", - primaryKeys = {"profileId", "announcementId"}, - indices = {@Index(value = {"profileId"})}) -public class Announcement { - public int profileId; - - @ColumnInfo(name = "announcementId") - public long id; - - @ColumnInfo(name = "announcementSubject") - public String subject; - @ColumnInfo(name = "announcementText") - public String text; - @Nullable - @ColumnInfo(name = "announcementStartDate") - public Date startDate; - @Nullable - @ColumnInfo(name = "announcementEndDate") - public Date endDate; - - public long teacherId; - - @Ignore - public Announcement() {} - - public Announcement(int profileId, long id, String subject, String text, @Nullable Date startDate, @Nullable Date endDate, long teacherId) { - this.profileId = profileId; - this.id = id; - this.subject = subject; - this.text = text; - this.startDate = startDate; - this.endDate = endDate; - this.teacherId = teacherId; - } -} - - - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/announcements/AnnouncementDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/announcements/AnnouncementDao.java deleted file mode 100644 index e14c966a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/announcements/AnnouncementDao.java +++ /dev/null @@ -1,63 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.announcements; - -import androidx.lifecycle.LiveData; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; -import androidx.room.RawQuery; -import androidx.sqlite.db.SimpleSQLiteQuery; -import androidx.sqlite.db.SupportSQLiteQuery; - -import java.util.List; - -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata; - -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_ANNOUNCEMENT; - -@Dao -public abstract class AnnouncementDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract long add(Announcement announcement); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract void addAll(List announcementList); - - @Query("DELETE FROM announcements WHERE profileId = :profileId") - public abstract void clear(int profileId); - - @RawQuery(observedEntities = {Announcement.class}) - abstract LiveData> getAll(SupportSQLiteQuery query); - public LiveData> getAll(int profileId, String filter) { - return getAll(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM announcements \n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN metadata ON announcementId = thingId AND thingType = "+TYPE_ANNOUNCEMENT+" AND metadata.profileId = "+profileId+"\n" + - "WHERE announcements.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - public LiveData> getAll(int profileId) { - return getAll(profileId, "1"); - } - public LiveData> getAllWhere(int profileId, String filter) { - return getAll(profileId, filter); - } - - @RawQuery(observedEntities = {Announcement.class, Metadata.class}) - abstract List getAllNow(SupportSQLiteQuery query); - public List getAllNow(int profileId, String filter) { - return getAllNow(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM announcements \n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN metadata ON announcementId = thingId AND thingType = "+TYPE_ANNOUNCEMENT+" AND metadata.profileId = "+profileId+"\n" + - "WHERE announcements.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - public List getNotNotifiedNow(int profileId) { - return getAllNow(profileId, "notified = 0"); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/announcements/AnnouncementFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/announcements/AnnouncementFull.java deleted file mode 100644 index 29d4e814..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/announcements/AnnouncementFull.java +++ /dev/null @@ -1,10 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.announcements; - -public class AnnouncementFull extends Announcement { - public String teacherFullName = ""; - - // metadata - public boolean seen; - public boolean notified; - public long addedDate; -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java deleted file mode 100644 index b7ae5ca4..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java +++ /dev/null @@ -1,60 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.attendance; - -import androidx.annotation.NonNull; -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; -import androidx.room.Index; - -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.utils.models.Time; - -@Entity(tableName = "attendances", - primaryKeys = {"profileId", "attendanceId", "attendanceLessonDate", "attendanceStartTime"}, - indices = {@Index(value = {"profileId"})}) -public class Attendance { - public int profileId; - - @ColumnInfo(name = "attendanceId") - public long id; - - @NonNull - @ColumnInfo(name = "attendanceLessonDate") - public Date lessonDate; - @NonNull - @ColumnInfo(name = "attendanceStartTime") - public Time startTime; - @ColumnInfo(name = "attendanceLessonTopic") - public String lessonTopic; - @ColumnInfo(name = "attendanceSemester") - public int semester; - public static final int TYPE_PRESENT = 0; - public static final int TYPE_ABSENT = 1; - public static final int TYPE_ABSENT_EXCUSED = 2; - public static final int TYPE_RELEASED = 3; - public static final int TYPE_BELATED = 4; - public static final int TYPE_BELATED_EXCUSED = 5; - public static final int TYPE_CUSTOM = 6; - @ColumnInfo(name = "attendanceType") - public int type = TYPE_PRESENT; - - public long teacherId; - public long subjectId; - - @Ignore - public Attendance() { - this(-1, -1, -1, -1, 0, "", Date.getToday(), Time.getNow(), TYPE_PRESENT); - } - - public Attendance(int profileId, long id, long teacherId, long subjectId, int semester, String lessonTopic, Date lessonDate, Time startTime, int type) { - this.profileId = profileId; - this.id = id; - this.teacherId = teacherId; - this.subjectId = subjectId; - this.semester = semester; - this.lessonTopic = lessonTopic; - this.lessonDate = lessonDate; - this.startTime = startTime; - this.type = type; - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceDao.java deleted file mode 100644 index 05c44822..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceDao.java +++ /dev/null @@ -1,94 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.attendance; - -import androidx.lifecycle.LiveData; -import androidx.sqlite.db.SimpleSQLiteQuery; -import androidx.sqlite.db.SupportSQLiteQuery; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; -import androidx.room.RawQuery; -import pl.szczodrzynski.edziennik.utils.models.Date; - -import java.util.List; - -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_ATTENDANCE; - -@Dao -public abstract class AttendanceDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract long add(Attendance attendance); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract void addAll(List attendanceList); - - @Query("DELETE FROM attendances WHERE profileId = :profileId") - public abstract void clear(int profileId); - - @Query("DELETE FROM attendances WHERE profileId = :profileId AND attendanceLessonDate > :date") - public abstract void clearAfterDate(int profileId, Date date); - - @RawQuery(observedEntities = {Attendance.class}) - abstract LiveData> getAll(SupportSQLiteQuery query); - public LiveData> getAll(int profileId, String filter) { - return getAll(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM attendances \n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN metadata ON attendanceId = thingId AND thingType = " + TYPE_ATTENDANCE + " AND metadata.profileId = "+profileId+"\n" + - "WHERE attendances.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY attendanceLessonDate DESC, attendanceStartTime DESC")); - } - public LiveData> getAll(int profileId) { - return getAll(profileId, "1"); - } - public LiveData> getAllWhere(int profileId, String filter) { - return getAll(profileId, filter); - } - - @RawQuery - abstract List getAllNow(SupportSQLiteQuery query); - public List getAllNow(int profileId, String filter) { - return getAllNow(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM attendances \n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN metadata ON attendanceId = thingId AND thingType = " + TYPE_ATTENDANCE + " AND metadata.profileId = "+profileId+"\n" + - "WHERE attendances.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY attendanceLessonDate DESC, attendanceStartTime DESC")); - } - public List getNotNotifiedNow(int profileId) { - return getAllNow(profileId, "notified = 0"); - } - - // only absent and absent_excused count as absences - // all the other types are counted as being present - @Query("SELECT \n" + - "CAST(SUM(CASE WHEN attendanceType != "+Attendance.TYPE_ABSENT+" AND attendanceType != "+Attendance.TYPE_ABSENT_EXCUSED+" THEN 1 ELSE 0 END) AS float)\n" + - " / \n" + - "CAST(count() AS float)*100 \n" + - "FROM attendances \n" + - "WHERE profileId = :profileId") - public abstract LiveData getAttendancePercentage(int profileId); - - @Query("SELECT \n" + - "CAST(SUM(CASE WHEN attendanceType != "+Attendance.TYPE_ABSENT+" AND attendanceType != "+Attendance.TYPE_ABSENT_EXCUSED+" THEN 1 ELSE 0 END) AS float)\n" + - " / \n" + - "CAST(count() AS float)*100 \n" + - "FROM attendances \n" + - "WHERE profileId = :profileId AND attendanceSemester = :semester") - public abstract float getAttendancePercentageNow(int profileId, int semester); - - @Query("SELECT \n" + - "CAST(SUM(CASE WHEN attendanceType != "+Attendance.TYPE_ABSENT+" AND attendanceType != "+Attendance.TYPE_ABSENT_EXCUSED+" THEN 1 ELSE 0 END) AS float)\n" + - " / \n" + - "CAST(count() AS float)*100 \n" + - "FROM attendances \n" + - "WHERE profileId = :profileId") - public abstract float getAttendancePercentageNow(int profileId); -} - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceFull.java deleted file mode 100644 index 8f9f3751..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceFull.java +++ /dev/null @@ -1,13 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.attendance; - -public class AttendanceFull extends Attendance { - public String teacherFullName = ""; - - public String subjectLongName = ""; - public String subjectShortName = ""; - - // metadata - public boolean seen; - public boolean notified; - public long addedDate; -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceType.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceType.kt deleted file mode 100644 index 701b852a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/AttendanceType.kt +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-23. - */ - -package pl.szczodrzynski.edziennik.data.db.modules.attendance - -import androidx.room.Entity - -@Entity(tableName = "attendanceTypes", - primaryKeys = ["profileId", "id"]) -data class AttendanceType ( - - val profileId: Int, - - val id: Long, - - val name: String, - - val type: Int, - - val color: Int - -) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/debuglog/DebugLogDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/debuglog/DebugLogDao.java deleted file mode 100644 index 14dd6a88..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/debuglog/DebugLogDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.debuglog; - -import androidx.room.Dao; -import androidx.room.Insert; - -@Dao -public interface DebugLogDao { - @Insert - void add(DebugLog debugLog); -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/Event.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/Event.java deleted file mode 100644 index dd2eebc0..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/Event.java +++ /dev/null @@ -1,130 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.events; - -import androidx.annotation.Nullable; -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; -import androidx.room.Index; - -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata; -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.utils.models.Time; - -@Entity(tableName = "events", - primaryKeys = {"profileId", "eventId"}, - indices = {@Index(value = {"profileId", "eventDate", "eventStartTime"}), @Index(value = {"profileId", "eventType"})}) -public class Event { - public int profileId; - - @ColumnInfo(name = "eventId") - public long id; - - @ColumnInfo(name = "eventDate") - public Date eventDate; - @ColumnInfo(name = "eventStartTime") - @Nullable - public Time startTime; // null for allDay - @ColumnInfo(name = "eventTopic") - public String topic; - @ColumnInfo(name = "eventColor") - public int color = -1; - public static final int TYPE_UNDEFINED = -2; - public static final int TYPE_HOMEWORK = -1; - public static final int TYPE_DEFAULT = 0; - public static final int TYPE_EXAM = 1; - public static final int TYPE_SHORT_QUIZ = 2; - public static final int TYPE_ESSAY = 3; - public static final int TYPE_PROJECT = 4; - public static final int TYPE_PT_MEETING = 5; - public static final int TYPE_EXCURSION = 6; - public static final int TYPE_READING = 7; - public static final int TYPE_CLASS_EVENT = 8; - public static final int TYPE_INFORMATION = 9; - public static final int TYPE_TEACHER_ABSENCE = 10; - public static final int COLOR_HOMEWORK = 0xff795548; - public static final int COLOR_DEFAULT = 0xffffc107; - public static final int COLOR_EXAM = 0xfff44336; - public static final int COLOR_SHORT_QUIZ = 0xff76ff03; - public static final int COLOR_ESSAY = 0xFF4050B5; - public static final int COLOR_PROJECT = 0xFF673AB7; - public static final int COLOR_PT_MEETING = 0xff90caf9; - public static final int COLOR_EXCURSION = 0xFF4CAF50; - public static final int COLOR_READING = 0xFFFFEB3B; - public static final int COLOR_CLASS_EVENT = 0xff388e3c; - public static final int COLOR_INFORMATION = 0xff039be5; - public static final int COLOR_TEACHER_ABSENCE = 0xff039be5; - @ColumnInfo(name = "eventType") - public int type = TYPE_DEFAULT; - @ColumnInfo(name = "eventAddedManually") - public boolean addedManually; - @ColumnInfo(name = "eventSharedBy") - public String sharedBy = null; - @ColumnInfo(name = "eventSharedByName") - public String sharedByName = null; - @ColumnInfo(name = "eventBlacklisted") - public boolean blacklisted = false; - - - public long teacherId; - public long subjectId; - public long teamId; - - @Ignore - public Event() {} - - public Event(int profileId, long id, Date eventDate, @Nullable Time startTime, String topic, int color, int type, boolean addedManually, long teacherId, long subjectId, long teamId) - { - this.profileId = profileId; - this.id = id; - this.eventDate = eventDate; - this.startTime = startTime; - this.topic = topic; - this.color = color; - this.type = type; - this.addedManually = addedManually; - this.teacherId = teacherId; - this.subjectId = subjectId; - this.teamId = teamId; - } - - @Ignore - public EventFull withMetadata(Metadata metadata) { - return new EventFull(this, metadata); - } - - @Override - public Event clone() throws CloneNotSupportedException { - return new Event( - profileId, - id, - eventDate.clone(), - startTime == null ? null : startTime.clone(), - topic, - color, - type, - addedManually, - subjectId, - teacherId, - teamId - ); - } - - @Override - public String toString() { - return "Event{" + - "profileId=" + profileId + - ", id=" + id + - ", eventDate=" + eventDate + - ", startTime=" + startTime + - ", topic='" + topic + '\'' + - ", color=" + color + - ", type=" + type + - ", addedManually=" + addedManually + - ", sharedBy='" + sharedBy + '\'' + - ", sharedByName='" + sharedByName + '\'' + - ", teacherId=" + teacherId + - ", subjectId=" + subjectId + - ", teamId=" + teamId + - '}'; - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventDao.java deleted file mode 100644 index ae55ec3c..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventDao.java +++ /dev/null @@ -1,146 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.events; - -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.lifecycle.LiveData; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; -import androidx.room.RawQuery; -import androidx.room.Transaction; -import androidx.sqlite.db.SimpleSQLiteQuery; -import androidx.sqlite.db.SupportSQLiteQuery; - -import java.util.List; - -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.utils.models.Time; - -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_EVENT; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_HOMEWORK; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_LESSON_CHANGE; - -@Dao -public abstract class EventDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract long add(Event event); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract void addAll(List eventList); - - @Query("DELETE FROM events WHERE profileId = :profileId") - public abstract void clear(int profileId); - - @Query("DELETE FROM events WHERE profileId = :profileId AND eventId = :id") - public abstract void remove(int profileId, long id); - @Query("DELETE FROM metadata WHERE profileId = :profileId AND thingType = :thingType AND thingId = :thingId") - public abstract void removeMetadata(int profileId, int thingType, long thingId); - @Transaction - public void remove(int profileId, int type, long id) { - remove(profileId, id); - removeMetadata(profileId, type == Event.TYPE_HOMEWORK ? TYPE_HOMEWORK : TYPE_EVENT, id); - } - @Transaction - public void remove(Event event) { - remove(event.profileId, event.type, event.id); - } - @Transaction - public void remove(int profileId, Event event) { - remove(profileId, event.type, event.id); - } - @Query("DELETE FROM events WHERE teamId = :teamId AND eventId = :id") - public abstract void removeByTeamId(long teamId, long id); - - @RawQuery(observedEntities = {Event.class}) - abstract LiveData> getAll(SupportSQLiteQuery query); - public LiveData> getAll(int profileId, String filter) { - String query = "SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName,\n" + - "eventTypes.eventTypeName AS typeName,\n" + - "eventTypes.eventTypeColor AS typeColor\n" + - "FROM events\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "LEFT JOIN eventTypes USING(profileId, eventType)\n" + - "LEFT JOIN metadata ON eventId = thingId AND (thingType = " + TYPE_EVENT + " OR thingType = " + TYPE_HOMEWORK + ") AND metadata.profileId = "+profileId+"\n" + - "WHERE events.profileId = "+profileId+" AND events.eventBlacklisted = 0 AND "+filter+"\n" + - "ORDER BY eventDate, eventStartTime ASC"; - Log.d("DB", query); - return getAll(new SimpleSQLiteQuery(query)); - } - public LiveData> getAll(int profileId) { - return getAll(profileId, "1"); - } - public List getAllNow(int profileId) { - return getAllNow(profileId, "1"); - } - public LiveData> getAllWhere(int profileId, String filter) { - return getAll(profileId, filter); - } - public LiveData> getAllByType(int profileId, int type, String filter) { - return getAll(profileId, "eventType = "+type+" AND "+filter); - } - public LiveData> getAllByDate(int profileId, @NonNull Date date) { - return getAll(profileId, "eventDate = '"+date.getStringY_m_d()+"'"); - } - public List getAllByDateNow(int profileId, @NonNull Date date) { - return getAllNow(profileId, "eventDate = '"+date.getStringY_m_d()+"'"); - } - public LiveData> getAllByDateTime(int profileId, @NonNull Date date, Time time) { - if (time == null) - return getAllByDate(profileId, date); - return getAll(profileId, "eventDate = '"+date.getStringY_m_d()+"' AND eventStartTime = '"+time.getStringValue()+"'"); - } - - @RawQuery - abstract List getAllNow(SupportSQLiteQuery query); - public List getAllNow(int profileId, String filter) { - return getAllNow(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName,\n" + - "eventTypes.eventTypeName AS typeName,\n" + - "eventTypes.eventTypeColor AS typeColor\n" + - "FROM events \n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "LEFT JOIN eventTypes USING(profileId, eventType)\n" + - "LEFT JOIN metadata ON eventId = thingId AND (thingType = " + TYPE_EVENT + " OR thingType = " + TYPE_HOMEWORK + ") AND metadata.profileId = "+profileId+"\n" + - "WHERE events.profileId = "+profileId+" AND events.eventBlacklisted = 0 AND "+filter+"\n" + - "ORDER BY eventStartTime, addedDate ASC")); - } - public List getNotNotifiedNow(int profileId) { - return getAllNow(profileId, "notified = 0"); - } - - public EventFull getByIdNow(int profileId, long eventId) { - List eventList = getAllNow(profileId, "eventId = "+eventId); - return eventList.size() == 0 ? null : eventList.get(0); - } - - @Query("UPDATE events SET eventAddedManually = 1 WHERE profileId = :profileId AND eventDate < :date") - public abstract void convertOlderToManual(int profileId, Date date); - - @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0") - public abstract void removeNotManual(int profileId); - - @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate") - public abstract void removeFuture(int profileId, Date todayDate); - - @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType = :type") - public abstract void removeFutureWithType(int profileId, Date todayDate, int type); - - @Query("DELETE FROM events WHERE profileId = :profileId AND eventAddedManually = 0 AND eventDate >= :todayDate AND eventType != :exceptType") - public abstract void removeFutureExceptType(int profileId, Date todayDate, int exceptType); - - @Query("UPDATE metadata SET seen = :seen WHERE profileId = :profileId AND (thingType = "+TYPE_EVENT+" OR thingType = "+TYPE_LESSON_CHANGE+" OR thingType = "+TYPE_HOMEWORK+") AND thingId IN (SELECT eventId FROM events WHERE profileId = :profileId AND eventDate = :date)") - public abstract void setSeenByDate(int profileId, Date date, boolean seen); - - @Query("UPDATE events SET eventBlacklisted = :blacklisted WHERE profileId = :profileId AND eventId = :eventId") - public abstract void setBlacklisted(int profileId, long eventId, boolean blacklisted); -} - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventFull.java deleted file mode 100644 index a801961a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventFull.java +++ /dev/null @@ -1,83 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.events; - -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata; - -public class EventFull extends Event { - public String typeName = ""; - public int typeColor = -1; - - public String teacherFullName = ""; - - public String subjectLongName = ""; - public String subjectShortName = ""; - - public String teamName = ""; - public String teamCode = null; - - // metadata - public boolean seen; - public boolean notified; - public long addedDate; - - public EventFull() {} - - public EventFull(Event event) { - super( - event.profileId, - event.id, - event.eventDate.clone(), - event.startTime == null ? null : event.startTime.clone(), - event.topic, - event.color, - event.type, - event.addedManually, - event.subjectId, - event.teacherId, - event.teamId - ); - - this.sharedBy = event.sharedBy; - this.sharedByName = event.sharedByName; - this.blacklisted = event.blacklisted; - } - - public EventFull(Event event, Metadata metadata) { - this(event); - - this.seen = metadata.seen; - this.notified = metadata.notified; - this.addedDate = metadata.addedDate; - } - - public int getColor() { - return color == -1 ? typeColor : color; - } - - @Override - public String toString() { - return "EventFull{" + - "profileId=" + profileId + - ", id=" + id + - ", eventDate=" + eventDate + - ", startTime=" + startTime + - ", topic='" + topic + '\'' + - ", color=" + color + - ", type=" + type + - ", addedManually=" + addedManually + - ", sharedBy='" + sharedBy + '\'' + - ", sharedByName='" + sharedByName + '\'' + - ", blacklisted=" + blacklisted + - ", teacherId=" + teacherId + - ", subjectId=" + subjectId + - ", teamId=" + teamId + - ", typeName='" + typeName + '\'' + - ", teacherFullName='" + teacherFullName + '\'' + - ", subjectLongName='" + subjectLongName + '\'' + - ", subjectShortName='" + subjectShortName + '\'' + - ", teamName='" + teamName + '\'' + - ", seen=" + seen + - ", notified=" + notified + - ", addedDate=" + addedDate + - '}'; - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventType.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventType.java deleted file mode 100644 index 30c4794a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventType.java +++ /dev/null @@ -1,31 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.events; - -import android.graphics.Color; - -import androidx.room.ColumnInfo; -import androidx.room.Entity; - -@Entity(tableName = "eventTypes", - primaryKeys = {"profileId", "eventType"}) -public class EventType { - public int profileId; - - @ColumnInfo(name = "eventType") - public long id; - - @ColumnInfo(name = "eventTypeName") - public String name; - @ColumnInfo(name = "eventTypeColor") - public int color; - - public EventType(int profileId, long id, String name, int color) { - this.profileId = profileId; - this.id = id; - this.name = name; - this.color = color; - } - - public EventType(int profileId, int id, String name, String color) { - this(profileId, id, name, Color.parseColor(color)); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventTypeDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventTypeDao.java deleted file mode 100644 index 7baf8189..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/events/EventTypeDao.java +++ /dev/null @@ -1,30 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.events; - -import java.util.List; - -import androidx.lifecycle.LiveData; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; - -@Dao -public interface EventTypeDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - void add(EventType gradeCategory); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - void addAll(List gradeCategoryList); - - @Query("DELETE FROM eventTypes WHERE profileId = :profileId") - void clear(int profileId); - - @Query("SELECT * FROM eventTypes WHERE profileId = :profileId AND eventType = :typeId") - EventType getByIdNow(int profileId, int typeId); - - @Query("SELECT * FROM eventTypes WHERE profileId = :profileId") - LiveData> getAll(int profileId); - - @Query("SELECT * FROM eventTypes WHERE profileId = :profileId") - List getAllNow(int profileId); -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/feedback/FeedbackMessage.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/feedback/FeedbackMessage.java deleted file mode 100644 index 14cd5823..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/feedback/FeedbackMessage.java +++ /dev/null @@ -1,28 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.feedback; - -import androidx.room.Entity; -import androidx.room.Ignore; -import androidx.room.PrimaryKey; - -@Entity(tableName = "feedbackMessages") -public class FeedbackMessage { - - @PrimaryKey(autoGenerate = true) - public int messageId; - - public boolean received = false; - public String fromUser = null; - public String fromUserName = null; - public long sentTime = System.currentTimeMillis(); - public String text; - - public FeedbackMessage(boolean received, String text) { - this.received = received; - this.sentTime = System.currentTimeMillis(); - this.text = text; - } - - @Ignore - public FeedbackMessage() { - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/feedback/FeedbackMessageDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/feedback/FeedbackMessageDao.java deleted file mode 100644 index 24a45376..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/feedback/FeedbackMessageDao.java +++ /dev/null @@ -1,33 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.feedback; - -import java.util.List; - -import androidx.lifecycle.LiveData; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; - -@Dao -public interface FeedbackMessageDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - void add(FeedbackMessage feedbackMessage); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - void addAll(List feedbackMessageList); - - @Query("DELETE FROM feedbackMessages") - void clear(); - - @Query("SELECT * FROM feedbackMessages") - List getAllNow(); - - @Query("SELECT * FROM feedbackMessages WHERE fromUser = :fromUser") - List getAllByUserNow(String fromUser); - - @Query("SELECT * FROM feedbackMessages") - LiveData> getAll(); - - @Query("SELECT *, COUNT(*) AS messageCount FROM feedbackMessages GROUP BY fromUser ORDER BY sentTime DESC") - List getAllWithCountNow(); -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/feedback/FeedbackMessageWithCount.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/feedback/FeedbackMessageWithCount.java deleted file mode 100644 index 17320fee..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/feedback/FeedbackMessageWithCount.java +++ /dev/null @@ -1,5 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.feedback; - -public class FeedbackMessageWithCount extends FeedbackMessage { - public int messageCount = 0; -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/Grade.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/Grade.java deleted file mode 100644 index e6883003..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/Grade.java +++ /dev/null @@ -1,99 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.grades; - -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; -import androidx.room.Index; - -@Entity(tableName = "grades", - primaryKeys = {"profileId", "gradeId"}, - indices = {@Index(value = {"profileId"})}) -public class Grade { - public int profileId; - - @ColumnInfo(name = "gradeId") - public long id; - - @ColumnInfo(name = "gradeCategory") - public String category; - @ColumnInfo(name = "gradeColor") - public int color; - @ColumnInfo(name = "gradeDescription") - public String description; - @ColumnInfo(name = "gradeComment") - public String comment; - @ColumnInfo(name = "gradeName") - public String name; - @ColumnInfo(name = "gradeValue") - public float value; - @ColumnInfo(name = "gradeValueMax") - public float valueMax; - @ColumnInfo(name = "gradeWeight") - public float weight; - @ColumnInfo(name = "gradeSemester") - public int semester; - @ColumnInfo(name = "gradeClassAverage") - public float classAverage = -1; - public static final int TYPE_NORMAL = 0; - public static final int TYPE_SEMESTER1_PROPOSED = 1; - public static final int TYPE_SEMESTER1_FINAL = 2; - public static final int TYPE_SEMESTER2_PROPOSED = 3; - public static final int TYPE_SEMESTER2_FINAL = 4; - public static final int TYPE_YEAR_PROPOSED = 5; - public static final int TYPE_YEAR_FINAL = 6; - public static final int TYPE_POINT = 10; - public static final int TYPE_BEHAVIOUR = 20; - public static final int TYPE_DESCRIPTIVE = 30; - public static final int TYPE_TEXT = 40; - @ColumnInfo(name = "gradeType") - public int type = TYPE_NORMAL; - @ColumnInfo(name = "gradePointGrade") - public boolean pointGrade = false; - - /** - * Applies for historical grades. It's the new/replacement grade's ID. - */ - @ColumnInfo(name = "gradeParentId") - public long parentId = -1; - - /** - * Applies for current grades. If the grade was worse and this is the improved one. - */ - @ColumnInfo(name = "gradeIsImprovement") - public boolean isImprovement = false; - - public long teacherId; - public long subjectId; - - @Ignore - public Grade() {} - - public Grade(int profileId, long id, String category, int color, String description, String name, float value, float weight, int semester, long teacherId, long subjectId) { - this.profileId = profileId; - this.id = id; - this.category = category; - this.color = color; - this.description = description; - this.name = name; - this.value = value; - this.weight = weight; - this.semester = semester; - this.teacherId = teacherId; - this.subjectId = subjectId; - } - - /*@Ignore - public Grade(int profileId, long id, String description, String name, float value, float weight, int semester, long teacherId, long categoryId, long subjectId) { - this.profileId = profileId; - this.id = id; - this.description = description; - this.name = name; - this.value = value; - this.weight = weight; - this.semester = semester; - this.teacherId = teacherId; - //this.categoryId = categoryId; - this.subjectId = subjectId; - }*/ -} - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeDao.java deleted file mode 100644 index 43b1ce1c..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeDao.java +++ /dev/null @@ -1,138 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.grades; - -import android.util.LongSparseArray; - -import androidx.lifecycle.LiveData; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; -import androidx.room.RawQuery; -import androidx.room.Transaction; -import androidx.sqlite.db.SimpleSQLiteQuery; -import androidx.sqlite.db.SupportSQLiteQuery; - -import java.util.List; - -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_GRADE; - -@Dao -public abstract class GradeDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract long add(Grade grade); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract void addAll(List gradeList); - - @Query("DELETE FROM grades WHERE profileId = :profileId") - public abstract void clear(int profileId); - - @Query("DELETE FROM grades WHERE profileId = :profileId AND gradeSemester = :semester") - public abstract void clearForSemester(int profileId, int semester); - - @RawQuery(observedEntities = {Grade.class}) - abstract LiveData> getAll(SupportSQLiteQuery query); - public LiveData> getAll(int profileId, String filter, String orderBy) { - return getAll(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM grades \n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN metadata ON gradeId = thingId AND thingType = " + TYPE_GRADE + " AND metadata.profileId = "+profileId+"\n" + - "WHERE grades.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY "+orderBy)); // TODO: 2019-04-30 why did I add sorting by gradeType??? - } - public LiveData> getAllOrderBy(int profileId, String orderBy) { - return getAll(profileId, "1", orderBy); - } - public LiveData> getAllWhere(int profileId, String filter) { - return getAll(profileId, filter, "addedDate DESC"); - } - - @RawQuery - abstract List getAllNow(SupportSQLiteQuery query); - public List getAllNow(int profileId, String filter) { - return getAllNow(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM grades \n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN metadata ON gradeId = thingId AND thingType = " + TYPE_GRADE + " AND metadata.profileId = "+profileId+"\n" + - "WHERE grades.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - public List getNotNotifiedNow(int profileId) { - return getAllNow(profileId, "notified = 0"); - } - public List getAllWithParentIdNow(int profileId, long parentId) { - return getAllNow(profileId, "gradeParentId = "+parentId); - } - - @RawQuery - abstract GradeFull getNow(SupportSQLiteQuery query); - public GradeFull getNow(int profileId, String filter) { - return getNow(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM grades \n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN metadata ON gradeId = thingId AND thingType = " + TYPE_GRADE + " AND metadata.profileId = "+profileId+"\n" + - "WHERE grades.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - public GradeFull getByIdNow(int profileId, long gradeId) { - return getNow(profileId, "gradeId = "+gradeId); - } - - @Query("UPDATE grades SET gradeClassAverage = :classAverage, gradeColor = :color WHERE profileId = :profileId AND gradeId = :gradeId") - public abstract void updateDetailsById(int profileId, long gradeId, float classAverage, int color); - - @Query("UPDATE metadata SET addedDate = :addedDate WHERE profileId = :profileId AND thingType = "+TYPE_GRADE+" AND thingId = :gradeId") - public abstract void updateAddedDateById(int profileId, long gradeId, long addedDate); - - @Transaction - public void updateDetails(int profileId, LongSparseArray gradeAverages, LongSparseArray gradeAddedDates, LongSparseArray gradeColors) { - for (int i = 0; i < gradeAverages.size(); i++) { - long gradeId = gradeAverages.keyAt(i); - float classAverage = gradeAverages.valueAt(i); - long addedDate = gradeAddedDates.valueAt(i); - int color = gradeColors.valueAt(i); - updateDetailsById(profileId, gradeId, classAverage, color); - updateAddedDateById(profileId, gradeId, addedDate); - } - } - - @Query("SELECT gradeId FROM grades WHERE profileId = :profileId ORDER BY gradeId") - public abstract List getIds(int profileId); - @Query("SELECT gradeClassAverage FROM grades WHERE profileId = :profileId ORDER BY gradeId") - public abstract List getClassAverages(int profileId); - @Query("SELECT gradeColor FROM grades WHERE profileId = :profileId ORDER BY gradeId") - public abstract List getColors(int profileId); - @Query("SELECT addedDate FROM metadata WHERE profileId = :profileId AND thingType = "+TYPE_GRADE+" ORDER BY thingId") - public abstract List getAddedDates(int profileId); - @Transaction - public void getDetails(int profileId, LongSparseArray gradeAddedDates, LongSparseArray gradeAverages, LongSparseArray gradeColors) { - List ids = getIds(profileId); - List classAverages = getClassAverages(profileId); - List colors = getColors(profileId); - List addedDates = getAddedDates(profileId); - for (int index = 0; index < ids.size(); index++) { - if (classAverages.size() > index) { - gradeAverages.put(ids.get(index), classAverages.get(index)); - } - if (colors.size() > index) { - gradeColors.put(ids.get(index), colors.get(index)); - } - if (addedDates.size() > index) { - gradeAddedDates.put(ids.get(index), addedDates.get(index)); - } - } - } - - public LiveData> getAllFromDate(int profileId, int semester, long date) { - return getAllWhere(profileId, "gradeSemester = " + semester + " AND addedDate > " + date); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeFull.java deleted file mode 100644 index 44c62b0a..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/grades/GradeFull.java +++ /dev/null @@ -1,17 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.grades; - -public class GradeFull extends Grade { - //public String category = ""; - //public int color; - - public String subjectLongName = ""; - public String subjectShortName = ""; - - public String teacherFullName = ""; - - // metadata - public boolean seen; - public boolean notified; - public long addedDate; -} - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/Lesson.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/Lesson.java deleted file mode 100644 index 95402750..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/Lesson.java +++ /dev/null @@ -1,79 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.lessons; - -import java.util.List; - -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; -import androidx.room.Index; -import androidx.annotation.NonNull; - -import pl.szczodrzynski.edziennik.utils.models.Time; -import pl.szczodrzynski.edziennik.utils.models.Week; - -@Entity(tableName = "lessons", - primaryKeys = {"profileId", "lessonWeekDay", "lessonStartTime", "lessonEndTime"}, - indices = {@Index(value = {"profileId", "lessonWeekDay"})}) -public class Lesson { - public int profileId; - - @ColumnInfo(name = "lessonWeekDay") - public int weekDay; - @NonNull - @ColumnInfo(name = "lessonStartTime") - public Time startTime; - @NonNull - @ColumnInfo(name = "lessonEndTime") - public Time endTime; - @ColumnInfo(name = "lessonClassroomName") - public String classroomName; - - public long teacherId; - public long subjectId; - public long teamId; - - @Ignore - public Lesson() { - this.profileId = -1; - this.startTime = new Time(); - this.endTime = new Time(); - } - - public Lesson(int profileId, int weekDay, @NonNull Time startTime, @NonNull Time endTime) { - this.profileId = profileId; - this.weekDay = weekDay; - this.startTime = startTime; - this.endTime = endTime; - this.teacherId = -1; - this.subjectId = -1; - this.teamId = -1; - } - - public Lesson(int profileId, int weekDay, String startTime, String endTime) { - this(profileId, weekDay, new Time().parseFromYmdHm(startTime), new Time().parseFromYmdHm(endTime)); - } - - public Lesson(int profileId, String dateStr, String startTime, String endTime) { - this(profileId, Week.getWeekDayFromDate(dateStr), startTime, endTime); - } - - public static Lesson fromLessonChange(LessonChange lessonChange) - { - Lesson lesson = new Lesson(lessonChange.profileId, lessonChange.lessonDate.getWeekDay(), lessonChange.startTime, lessonChange.endTime); - lesson.profileId = lessonChange.profileId; - lesson.teacherId = lessonChange.teacherId; - lesson.teamId = lessonChange.teamId; - lesson.subjectId = lessonChange.subjectId; - lesson.classroomName = lessonChange.classroomName; - return lesson; - } - - public static Lesson getByWeekDayAndSubject(List lessonList, int weekDay, long subjectId) { - for (Lesson lesson: lessonList) { - if (lesson.weekDay == weekDay && lesson.subjectId == subjectId) - return lesson; - } - return null; - } -} - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonChange.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonChange.java deleted file mode 100644 index e651494e..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonChange.java +++ /dev/null @@ -1,97 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.lessons; - -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Index; -import androidx.annotation.NonNull; - -import java.util.List; - -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.utils.models.Time; - -@Entity(tableName = "lessonChanges", - primaryKeys = {"profileId", "lessonChangeDate", "lessonChangeStartTime", "lessonChangeEndTime"}, - indices = {@Index(value = {"profileId", "lessonChangeDate"})}) -public class LessonChange { - public int profileId; - - @ColumnInfo(name = "lessonChangeId") - public long id; - - @ColumnInfo(name = "lessonChangeWeekDay") - public int weekDay; - @NonNull - @ColumnInfo(name = "lessonChangeDate") - public Date lessonDate; - @NonNull - @ColumnInfo(name = "lessonChangeStartTime") - public Time startTime; - @NonNull - @ColumnInfo(name = "lessonChangeEndTime") - public Time endTime; - @ColumnInfo(name = "lessonChangeClassroomName") - public String classroomName; - @ColumnInfo(name = "lessonChangeType") - public int type; - public static int TYPE_CANCELLED = 1; - public static int TYPE_CHANGE = 2; - public static int TYPE_ADDED = 3; - - public long teacherId; - public long subjectId; - public long teamId; - - public LessonChange() - { - this.profileId = -1; - this.lessonDate = Date.getToday(); - this.weekDay = this.lessonDate.getWeekDay(); - this.startTime = Time.getNow(); - this.endTime = Time.getNow(); - this.id = System.currentTimeMillis(); - } - - public LessonChange(int profileId, String dateStr, String startTime, String endTime) - { - this(profileId, new Date().parseFromYmd(dateStr), new Time().parseFromYmdHm(startTime), new Time().parseFromYmdHm(endTime)); - } - - public LessonChange(int profileId, @NonNull Date date, @NonNull Time startTime, @NonNull Time endTime) - { - this.profileId = profileId; - this.lessonDate = date; - this.weekDay = this.lessonDate.getWeekDay(); - this.startTime = startTime; - this.endTime = endTime; - this.id = date.combineWith(startTime); - } - - public Lesson getOriginalLesson(List lessonList) - { - int weekDay = this.lessonDate.getWeekDay(); - for (Lesson lesson: lessonList) { - if (lesson.weekDay == weekDay - && lesson.startTime.getValue() == this.startTime.getValue() - && lesson.endTime.getValue() == this.endTime.getValue()) - { - return lesson; - } - } - return null; - } - - public boolean matches(Lesson lesson) { - if (lesson == null) { - return false; - } - // we are assuming the start and end time is equal - return this.profileId == lesson.profileId - && this.teacherId == lesson.teacherId - && this.subjectId == lesson.subjectId - && this.teamId == lesson.teamId - && this.classroomName.equals(lesson.classroomName); - } -} - - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonChangeDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonChangeDao.java deleted file mode 100644 index c854ce99..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonChangeDao.java +++ /dev/null @@ -1,113 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.lessons; - -import androidx.lifecycle.LiveData; -import androidx.sqlite.db.SimpleSQLiteQuery; -import androidx.sqlite.db.SupportSQLiteQuery; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; -import androidx.room.RawQuery; - -import java.util.List; - -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.ui.modules.agenda.lessonchange.LessonChangeCounter; - -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_LESSON_CHANGE; -import static pl.szczodrzynski.edziennik.utils.Utils.d; - -@Dao -public abstract class LessonChangeDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract long add(LessonChange lessonChange); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract void addAll(List lessonChangeList); - - @Query("DELETE FROM lessonChanges WHERE profileId = :profileId") - public abstract void clear(int profileId); - - public static String getQueryString(int profileId, String filter) { - return "SELECT\n" + - "lessonChanges.profileId AS lessonChangeProfileId,\n" + - "lessonChanges.lessonChangeId,\n" + - "lessonChanges.lessonChangeDate,\n" + - "lessonChanges.lessonChangeStartTime,\n" + - "lessonChanges.lessonChangeType,\n" + - "lessonChanges.lessonChangeClassroomName,\n" + - "lessonChanges.subjectId AS changeSubjectId,\n" + - "lessonChanges.teacherId AS changeTeacherId,\n" + - "lessonChanges.teamId AS changeTeamId,\n" + - "subjects.subjectLongName AS changeSubjectLongName,\n" + - "subjects.subjectShortName AS changeSubjectShortName,\n" + - "teams.teamName AS changeTeamName," + - "teachers.teacherName || ' ' || teachers.teacherSurname AS changeTeacherFullName,\n" + - "metadata.seen, metadata.notified, metadata.addedDate\n" + - "FROM lessonChanges\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "LEFT JOIN metadata ON lessonChangeId = thingId AND thingType = " + TYPE_LESSON_CHANGE + " AND metadata.profileId = lessonChanges.profileId\n" +// TODO validate this works!. I hope so - "WHERE "+(profileId == -1 ? "" : "lessonChanges.profileId = "+profileId+" AND ")+filter+"\n" + - "ORDER BY lessonChanges.profileId, lessonChangeDate, lessonChangeStartTime ASC"; - } - - @RawQuery(observedEntities = {Lesson.class, LessonChange.class}) - abstract LiveData> getAll(SupportSQLiteQuery query); - @RawQuery - abstract List getAllNow(SupportSQLiteQuery query); - @RawQuery - abstract LessonFull getNow(SupportSQLiteQuery query); - - public String getQueryWithLessons(int profileId, String filter) { - return "SELECT\n" + - "lessonChanges.profileId,\n" + - "lessonChangeId,\n" + - "lessonChangeDate AS lessonDate,\n" + - "lessonChangeStartTime,\n" + - "lessonChangeType,\n" + - "lessonChangeClassroomName,\n" + - "lessonChanges.subjectId AS changeSubjectId,\n" + - "lessonChanges.teacherId AS changeTeacherId,\n" + - "lessonChanges.teamId AS changeTeamId,\n" + - "subjects.subjectLongName AS changeSubjectLongName,\n" + - "subjects.subjectShortName AS changeSubjectShortName,\n" + - "lessonsFull.*,\n" + - "teams.teamName AS changeTeamName,teachers.teacherName || ' ' || teachers.teacherSurname AS changeTeacherFullName\n" + - ",metadata.*FROM lessonChanges\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "LEFT JOIN metadata ON lessonChangeId = thingId AND thingType = 6 AND metadata.profileId = "+profileId+"\n" + - "JOIN (\n" + - "SELECT subjects.subjectLongName,\n" + - "lessons.*,\n" + - "subjects.subjectShortName,\n" + - "teams.teamName,\n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM lessons\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "WHERE lessons.profileId = "+profileId+") lessonsFull ON lessonChangeWeekDay = lessonsFull.lessonWeekDay AND lessonChangeStartTime = lessonStartTime\n" + - "WHERE lessonChanges.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY lessonChangeDate, lessonChangeStartTime ASC"; - } - - public List getAllChangesWithLessonsNow(int profileId) { - String query = getQueryWithLessons(profileId, "1"); - d("DB", query); - return getAllNow(new SimpleSQLiteQuery(query)); - } - - public List getNotNotifiedNow(int profileId) { - return getAllNow(new SimpleSQLiteQuery(getQueryWithLessons(profileId, "notified = 0"))); - } - - @Query("SELECT profileId, lessonChangeDate, count(*) AS lessonChangeCount FROM lessonChanges WHERE profileId = :profileId GROUP BY lessonChangeDate") - public abstract List getLessonChangeCountersNow(int profileId); - - @Query("SELECT profileId, lessonChangeDate, count(*) AS lessonChangeCount FROM lessonChanges WHERE profileId = :profileId AND lessonChangeDate = :date GROUP BY lessonChangeDate") - public abstract LiveData getLessonChangeCounterByDate(int profileId, Date date); -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonChangeFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonChangeFull.java deleted file mode 100644 index 87cb2b95..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonChangeFull.java +++ /dev/null @@ -1,15 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.lessons; - -public class LessonChangeFull extends LessonChange { - /*public String changeTeacherFullName = ""; - - public String changeSubjectLongName = ""; - public String changeSubjectShortName = ""; - - public String changeTeamName = ""; - - // metadata - public boolean seen; - public boolean notified; - public long addedDate;*/ -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonDao.java deleted file mode 100644 index 220977ab..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonDao.java +++ /dev/null @@ -1,171 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.lessons; - -import androidx.lifecycle.LiveData; -import androidx.sqlite.db.SimpleSQLiteQuery; -import androidx.sqlite.db.SupportSQLiteQuery; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; -import androidx.room.RawQuery; -import androidx.annotation.NonNull; - -import java.util.List; - -import pl.szczodrzynski.edziennik.utils.models.Date; -import pl.szczodrzynski.edziennik.utils.models.Time; - -@Dao -public abstract class LessonDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract long add(Lesson lesson); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract void addAll(List lessonList); - - @Query("DELETE FROM lessons WHERE profileId = :profileId") - public abstract void clear(int profileId); - - @RawQuery(observedEntities = {Lesson.class, LessonChange.class}) - abstract LiveData> getAll(SupportSQLiteQuery query); - @RawQuery - abstract List getAllNow(SupportSQLiteQuery query); - @RawQuery - abstract LessonFull getNow(SupportSQLiteQuery query); - - public LiveData> getAllByDate(int profileId, @NonNull Date date, @NonNull Time nowTime) { - int weekDay = date.getWeekDay(); - String query = "SELECT\n" + - "lessons.*,\n" + - "subjects.subjectLongName,\n" + - "subjects.subjectShortName,\n" + - "teams.teamName,\n" + - "lessonChangesFull.*,\n" + - "('"+nowTime.getStringValue()+"' > lessonEndTime AND lessonWeekDay = "+weekDay+") AS lessonPassed,\n" + - "('"+nowTime.getStringValue()+"' BETWEEN lessonStartTime AND lessonEndTime AND lessonWeekDay = "+weekDay+") AS lessonCurrent,\n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM lessons\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "LEFT JOIN \n" + - "(" - +LessonChangeDao.getQueryString(profileId, "lessonChangeDate = '"+date.getStringY_m_d()+"'")+ - ") lessonChangesFull ON lessons.profileId = lessonChangesFull.lessonChangeProfileId AND lessonStartTime = lessonChangeStartTime\n" + - "WHERE lessons.profileId = "+profileId+" AND lessonWeekDay = "+weekDay+"\n" + - "ORDER BY lessonStartTime ASC"; - //Log.d("DB", "Query "+query); - return getAll(new SimpleSQLiteQuery(query)); - } - - public List getAllWeekNow(int profileId, @NonNull Date weekBeginDate, @NonNull Date todayDate) { - String query = "SELECT\n" + - "lessons.*,\n" + - "subjects.subjectLongName,\n" + - "subjects.subjectShortName,\n" + - "teams.teamName,\n" + - "lessonChangesFull.*,\n" + - "date(\n" + - "'"+weekBeginDate.getStringY_m_d()+"', \n" + - "'+'||(case 1 when lessonWeekDay < "+todayDate.getWeekDay()+" then lessonWeekDay+7 else lessonWeekDay end)||' days'\n" + - ") AS lessonDate,\n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM lessons\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "LEFT JOIN \n" + - "(" - +LessonChangeDao.getQueryString(profileId, "1")+ - ") lessonChangesFull ON lessons.profileId = lessonChangesFull.lessonChangeProfileId AND lessonStartTime = lessonChangeStartTime AND lessonChangesFull.lessonChangeDate = lessonDate\n" + - (profileId == -1 ? "" : "WHERE lessons.profileId = "+profileId+"\n") + - "ORDER BY lessons.profileId, lessonDate, lessonStartTime ASC\n"; - //Log.d("DB", "Query "+query); - return getAllNow(new SimpleSQLiteQuery(query)); - } - - public LessonFull getByDateTimeNow(int profileId, @NonNull Date date, @NonNull Time time) { - String query = "SELECT\n" + - "lessons.*,\n" + - "subjects.subjectLongName,\n" + - "subjects.subjectShortName,\n" + - "teams.teamName,\n" + - "lessonChangesFull.*,\n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM lessons\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "LEFT JOIN \n" + - "(" - +LessonChangeDao.getQueryString(profileId, "lessonChangeDate = '"+date.getStringY_m_d()+"'")+ - ") lessonChangesFull ON lessons.profileId = lessonChangesFull.lessonChangeProfileId AND lessonStartTime = lessonChangeStartTime\n" + - "WHERE lessons.profileId = "+profileId+" AND lessonWeekDay = "+date.getWeekDay()+" AND ('"+time.getStringValue()+"' BETWEEN lessonStartTime AND lessonEndTime)\n" + - "ORDER BY lessonStartTime ASC"; - //Log.d("DB", "Query "+query); - return getNow(new SimpleSQLiteQuery(query)); - } - - public List getAllNearestNow(int profileId, @NonNull Date weekBeginDate, @NonNull Date todayDate, @NonNull Time nowTime) { - int todayWeekDay = todayDate.getWeekDay(); - String query = "SELECT\n" + - "lessons.*,\n" + - "subjects.subjectLongName,\n" + - "subjects.subjectShortName,\n" + - "teams.teamName,\n" + - "lessonChangesFull.*,\n" + - "date(\n" + - "'"+weekBeginDate.getStringY_m_d()+"', \n" + - "'+'||(case 1 when lessonWeekDay < "+todayWeekDay+" then lessonWeekDay+7 else lessonWeekDay end)||' days'\n" + - ") AS lessonDate,\n" + - "('"+nowTime.getStringValue()+"' > lessonEndTime AND lessonWeekDay = "+todayWeekDay+") AS lessonPassed,\n" + - "('"+nowTime.getStringValue()+"' BETWEEN lessonStartTime AND lessonEndTime AND lessonWeekDay = "+todayWeekDay+") AS lessonCurrent,\n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM lessons\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "LEFT JOIN \n" + - "(" - +LessonChangeDao.getQueryString(profileId, "1")+ - ") lessonChangesFull ON lessons.profileId = lessonChangesFull.lessonChangeProfileId AND lessonStartTime = lessonChangeStartTime AND lessonChangesFull.lessonChangeDate = lessonDate\n" + - "WHERE lessons.profileId = "+profileId+" AND (lessonWeekDay != "+todayWeekDay+" OR '"+nowTime.getStringValue()+"' < lessonEndTime OR '"+nowTime.getStringValue()+"' > lessonStartTime)\n" + - "ORDER BY lessonDate, lessonStartTime ASC"; - //Log.d("DB", "Query "+query); - return getAllNow(new SimpleSQLiteQuery(query)); - } - - public LiveData> getAllByDateWithoutChanges(int profileId, @NonNull Date date) { - String query = "SELECT\n" + - "lessons.*,\n" + - "subjects.subjectLongName,\n" + - "subjects.subjectShortName,\n" + - "teams.teamName,\n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM lessons\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "WHERE lessons.profileId = "+profileId+" AND lessonWeekDay = "+date.getWeekDay()+"\n" + - "ORDER BY lessonStartTime ASC"; - //Log.d("DB", "Query "+query); - return getAll(new SimpleSQLiteQuery(query)); - } - - public LessonFull getByDateTimeWithoutChangesNow(int profileId, @NonNull Date date, @NonNull Time time) { - String query = "SELECT\n" + - "lessons.*,\n" + - "subjects.subjectLongName,\n" + - "subjects.subjectShortName,\n" + - "teams.teamName,\n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM lessons\n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN subjects USING(profileId, subjectId)\n" + - "LEFT JOIN teams USING(profileId, teamId)\n" + - "WHERE lessons.profileId = "+profileId+" AND lessonWeekDay = "+date.getWeekDay()+" AND lessonStartTime = '"+time.getStringValue()+"'\n" + - "ORDER BY lessonStartTime ASC"; - //Log.d("DB", "Query "+query); - return getNow(new SimpleSQLiteQuery(query)); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonFull.java deleted file mode 100644 index fc607833..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/lessons/LessonFull.java +++ /dev/null @@ -1,151 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.lessons; - -import androidx.room.ColumnInfo; -import android.content.Context; -import androidx.annotation.Nullable; - -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.utils.models.Date; - -import static pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_ADDED; -import static pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_CANCELLED; -import static pl.szczodrzynski.edziennik.data.db.modules.lessons.LessonChange.TYPE_CHANGE; -import static pl.szczodrzynski.edziennik.utils.Utils.bs; - -public class LessonFull extends Lesson { - public String teacherFullName = ""; - - public String subjectLongName = ""; - public String subjectShortName = ""; - - public String teamName = ""; - - @Nullable - public Date lessonDate; - - @ColumnInfo(name = "lessonChangeId") - public long changeId; - @ColumnInfo(name = "lessonChangeType") - public int changeType = -1; - @ColumnInfo(name = "lessonChangeClassroomName") - public String changeClassroomName = ""; - public String changeTeacherFullName = ""; - - public String changeSubjectLongName = ""; - public String changeSubjectShortName = ""; - - public String changeTeamName = ""; - - public long changeTeacherId; - public long changeSubjectId; - public long changeTeamId; - - // metadata - public boolean seen; - public boolean notified; - public long addedDate; - - public boolean lessonPassed; - public boolean lessonCurrent; - - public boolean changedTeacherFullName() { - return changeId != 0 && changeType != TYPE_CANCELLED && changeTeacherFullName != null && !changeTeacherFullName.equals(teacherFullName) && !changeTeacherFullName.equals(""); - } - public boolean changedSubjectLongName() { - return changeId != 0 && changeType != TYPE_CANCELLED && changeSubjectLongName != null && !changeSubjectLongName.equals(subjectLongName) && !changeSubjectLongName.equals(""); - } - public boolean changedTeamName() { - return changeId != 0 && changeType != TYPE_CANCELLED && changeTeamName != null && !changeTeamName.equals(teamName) && !changeTeamName.equals(""); - } - public boolean changedClassroomName() { - return changeId != 0 && changeType != TYPE_CANCELLED && changeClassroomName != null && !changeClassroomName.equals(classroomName) && !changeClassroomName.equals(""); - } - - public String getTeacherFullName() { - return getTeacherFullName(false); - } - public String getTeacherFullName(boolean formatted) { - if (!changedTeacherFullName()) - return bs(teacherFullName); - else - return (formatted?bs(teacherFullName)+" -> ":"") + bs(changeTeacherFullName); - } - - public String getSubjectLongName() { - return getSubjectLongName(false); - } - public String getSubjectLongName(boolean formatted) { - if (!changedSubjectLongName()) - return bs(subjectLongName); - else - return (formatted?bs(subjectLongName)+" -> ":"") + bs(changeSubjectLongName); - } - - public String getTeamName() { - return getTeamName(false); - } - public String getTeamName(boolean formatted) { - if (!changedTeamName()) - return bs(teamName); - else - return (formatted?bs(teamName)+" -> ":"") + bs(changeTeamName); - } - - public String getClassroomName() { - return getClassroomName(false); - } - public String getClassroomName(boolean formatted) { - if (!changedClassroomName()) - return bs(classroomName); - else - return (formatted?bs(classroomName)+" -> ":"") + bs(changeClassroomName); - } - - public String changeTypeStr(Context context) { - if (changeType == TYPE_CANCELLED) { - return context.getString(R.string.lesson_cancelled); - } - if (changeType == TYPE_CHANGE) { - return context.getString(R.string.lesson_change); - } - if (changeType == TYPE_ADDED) { - return context.getString(R.string.lesson_added); - } - return context.getString(R.string.lesson_timetable_change); - } - - @Override - public String toString() { - return "LessonFull{" + - "profileId=" + profileId + - ", weekDay=" + weekDay + - ", startTime=" + startTime + - ", endTime=" + endTime + - ", classroomName='" + classroomName + '\'' + - ", teacherId=" + teacherId + - ", subjectId=" + subjectId + - ", teamId=" + teamId + - ", teacherFullName='" + teacherFullName + '\'' + - ", subjectLongName='" + subjectLongName + '\'' + - ", subjectShortName='" + subjectShortName + '\'' + - ", teamName='" + teamName + '\'' + - ", lessonDate=" + lessonDate + - ", changeId=" + changeId + - ", changeType=" + changeType + - ", changeClassroomName='" + changeClassroomName + '\'' + - ", changeTeacherFullName='" + changeTeacherFullName + '\'' + - ", changeSubjectLongName='" + changeSubjectLongName + '\'' + - ", changeSubjectShortName='" + changeSubjectShortName + '\'' + - ", changeTeamName='" + changeTeamName + '\'' + - ", changeTeacherId=" + changeTeacherId + - ", changeSubjectId=" + changeSubjectId + - ", changeTeamId=" + changeTeamId + - ", seen=" + seen + - ", notified=" + notified + - ", addedDate=" + addedDate + - ", lessonPassed=" + lessonPassed + - ", lessonCurrent=" + lessonCurrent + - '}'; - } -} - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStore.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStore.java deleted file mode 100644 index e3d25623..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/login/LoginStore.java +++ /dev/null @@ -1,196 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.login; - -import android.os.Bundle; - -import androidx.annotation.Nullable; -import androidx.room.ColumnInfo; -import androidx.room.Entity; - -import com.google.gson.JsonElement; -import com.google.gson.JsonNull; -import com.google.gson.JsonObject; - -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull; - -@Entity(tableName = "loginStores", - primaryKeys = {"loginStoreId"}) -public class LoginStore { - @ColumnInfo(name = "loginStoreId") - public int id = -1; - @ColumnInfo(name = "loginStoreType") - public int type = -1; - public final static int LOGIN_TYPE_MOBIDZIENNIK = 1; - public final static int LOGIN_TYPE_LIBRUS = 2; - public final static int LOGIN_TYPE_VULCAN = 4; - public final static int LOGIN_TYPE_IUCZNIOWIE = 3; - public final static int LOGIN_TYPE_DEMO = 20; - @ColumnInfo(name = "loginStoreData") - public JsonObject data; - - @ColumnInfo(name = "loginStoreMode") - public int mode = 0; - public static final int LOGIN_MODE_LIBRUS_EMAIL = 0; - public static final int LOGIN_MODE_LIBRUS_SYNERGIA = 1; - public static final int LOGIN_MODE_LIBRUS_JST = 2; - - public LoginStore(int id, int type, JsonObject data) { - this.id = id; - this.type = type; - this.data = data; - } - - public static LoginStore fromProfileFull(ProfileFull profileFull) { - return new LoginStore(profileFull.getLoginStoreId(), profileFull.getLoginStoreType(), profileFull.getLoginStoreData()); - } - - public void copyFrom(Bundle args) { - for (String key: args.keySet()) { - Object o = args.get(key); - if (o instanceof String) { - putLoginData(key, (String) o); - } - else if (o instanceof Integer) { - putLoginData(key, (Integer) o); - } - else if (o instanceof Long) { - putLoginData(key, (Long) o); - } - else if (o instanceof Float) { - putLoginData(key, (Float) o); - } - else if (o instanceof Boolean) { - putLoginData(key, (Boolean) o); - } - } - } - public boolean hasLoginData(String key) { - if (data == null) - return false; - return data.has(key); - } - @Nullable - public String getLoginData(String key, @Nullable String defaultValue) { - if (data == null) - return defaultValue; - JsonElement element = data.get(key); - if (element != null && !(element instanceof JsonNull)) { - return element.getAsString(); - } - return defaultValue; - } - @Nullable - public int getLoginData(String key, int defaultValue) { - if (data == null) - return defaultValue; - JsonElement element = data.get(key); - if (element != null && !(element instanceof JsonNull)) { - return element.getAsInt(); - } - return defaultValue; - } - @Nullable - public long getLoginData(String key, long defaultValue) { - if (data == null) - return defaultValue; - JsonElement element = data.get(key); - if (element != null && !(element instanceof JsonNull)) { - return element.getAsLong(); - } - return defaultValue; - } - @Nullable - public float getLoginData(String key, float defaultValue) { - if (data == null) - return defaultValue; - JsonElement element = data.get(key); - if (element != null && !(element instanceof JsonNull)) { - return element.getAsFloat(); - } - return defaultValue; - } - public boolean getLoginData(String key, boolean defaultValue) { - if (data == null) - return defaultValue; - JsonElement element = data.get(key); - if (element != null && !(element instanceof JsonNull)) { - return element.getAsBoolean(); - } - return defaultValue; - } - - public void putLoginData(String key, String value) { - forceLoginStore(); - data.addProperty(key, value); - } - public void putLoginData(String key, int value) { - forceLoginStore(); - data.addProperty(key, value); - } - public void putLoginData(String key, long value) { - forceLoginStore(); - data.addProperty(key, value); - } - public void putLoginData(String key, float value) { - forceLoginStore(); - data.addProperty(key, value); - } - public void putLoginData(String key, boolean value) { - forceLoginStore(); - data.addProperty(key, value); - } - - public void removeLoginData(String key) { - if (data == null) - return; - data.remove(key); - } - - public void clearLoginStore() { - data = new JsonObject(); - } - - private void forceLoginStore() { - if (data == null) { - clearLoginStore(); - } - } - - public String type() { - switch (type) { - case LOGIN_TYPE_MOBIDZIENNIK: - return "LOGIN_TYPE_MOBIDZIENNIK"; - case LOGIN_TYPE_LIBRUS: - return "LOGIN_TYPE_LIBRUS"; - case LOGIN_TYPE_IUCZNIOWIE: - return "LOGIN_TYPE_IDZIENNIK"; - case LOGIN_TYPE_VULCAN: - return "LOGIN_TYPE_VULCAN"; - case LOGIN_TYPE_DEMO: - return "LOGIN_TYPE_DEMO"; - default: - return "unknown"; - } - } - public String mode() { - switch (mode) { - case LOGIN_MODE_LIBRUS_EMAIL: - return "LOGIN_MODE_LIBRUS_EMAIL"; - case LOGIN_MODE_LIBRUS_SYNERGIA: - return "LOGIN_MODE_LIBRUS_SYNERGIA"; - case LOGIN_MODE_LIBRUS_JST: - return "LOGIN_MODE_LIBRUS_JST"; - default: - return "unknown"; - } - } - - @Override - public String toString() { - return "LoginStore{" + - "id=" + id + - ", type=" + type() + - ", mode=" + mode() + - ", data=" + data + - '}'; - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumber.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumber.java deleted file mode 100644 index cad09b62..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumber.java +++ /dev/null @@ -1,31 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.luckynumber; - -import androidx.annotation.NonNull; -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; - -import pl.szczodrzynski.edziennik.utils.models.Date; - -@Entity(tableName = "luckyNumbers", - primaryKeys = {"profileId", "luckyNumberDate"}) -public class LuckyNumber { - public int profileId; - - @NonNull - @ColumnInfo(name = "luckyNumberDate", typeAffinity = 3) - public Date date; - @ColumnInfo(name = "luckyNumber") - public int number; - - public LuckyNumber(int profileId, @NonNull Date date, int number) { - this.profileId = profileId; - this.date = date; - this.number = number; - } - - @Ignore - public LuckyNumber() { - this.date = Date.getToday(); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberDao.java deleted file mode 100644 index 4b8f54cd..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberDao.java +++ /dev/null @@ -1,75 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.luckynumber; - -import androidx.annotation.Nullable; -import androidx.lifecycle.LiveData; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; -import androidx.room.RawQuery; -import androidx.sqlite.db.SimpleSQLiteQuery; -import androidx.sqlite.db.SupportSQLiteQuery; - -import java.util.List; - -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata; -import pl.szczodrzynski.edziennik.data.db.modules.notices.Notice; -import pl.szczodrzynski.edziennik.utils.models.Date; - -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_LUCKY_NUMBER; - -@Dao -public abstract class LuckyNumberDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract void add(LuckyNumber luckyNumber); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract void addAll(List luckyNumberList); - - @Query("DELETE FROM luckyNumbers WHERE profileId = :profileId") - public abstract void clear(int profileId); - - @Query("SELECT * FROM luckyNumbers WHERE profileId = :profileId AND luckyNumberDate = :date") - public abstract LiveData getByDate(int profileId, Date date); - - @Query("SELECT * FROM luckyNumbers WHERE profileId = :profileId AND luckyNumberDate = :date") - public abstract LuckyNumber getByDateNow(int profileId, Date date); - - @Nullable - @Query("SELECT * FROM luckyNumbers WHERE profileId = :profileId AND luckyNumberDate >= :date ORDER BY luckyNumberDate DESC LIMIT 1") - public abstract LuckyNumber getNearestFutureNow(int profileId, int date); - - @Query("SELECT * FROM luckyNumbers WHERE profileId = :profileId AND luckyNumberDate >= :date ORDER BY luckyNumberDate DESC LIMIT 1") - public abstract LiveData getNearestFuture(int profileId, int date); - - @RawQuery(observedEntities = {LuckyNumber.class}) - abstract LiveData> getAll(SupportSQLiteQuery query); - public LiveData> getAll(int profileId, String filter) { - return getAll(new SimpleSQLiteQuery("SELECT\n" + - "*\n" + - "FROM luckyNumbers\n" + - "LEFT JOIN metadata ON luckyNumberDate = thingId AND thingType = "+TYPE_LUCKY_NUMBER+" AND metadata.profileId = "+profileId+"\n" + - "WHERE luckyNumbers.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - public LiveData> getAll(int profileId) { - return getAll(profileId, "1"); - } - public LiveData> getAllWhere(int profileId, String filter) { - return getAll(profileId, filter); - } - - @RawQuery(observedEntities = {Notice.class, Metadata.class}) - abstract List getAllNow(SupportSQLiteQuery query); - public List getAllNow(int profileId, String filter) { - return getAllNow(new SimpleSQLiteQuery("SELECT\n" + - "*\n" + - "FROM luckyNumbers\n" + - "LEFT JOIN metadata ON luckyNumberDate = thingId AND thingType = "+TYPE_LUCKY_NUMBER+" AND metadata.profileId = "+profileId+"\n" + - "WHERE luckyNumbers.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - public List getNotNotifiedNow(int profileId) { - return getAllNow(profileId, "notified = 0"); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberFull.java deleted file mode 100644 index f08b7d0d..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/luckynumber/LuckyNumberFull.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-18. - */ - -package pl.szczodrzynski.edziennik.data.db.modules.luckynumber; - -public class LuckyNumberFull extends LuckyNumber { - // metadata - public boolean seen; - public boolean notified; - public long addedDate; -} - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/Message.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/Message.java deleted file mode 100644 index 20b985b1..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/Message.java +++ /dev/null @@ -1,88 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.messages; - -import androidx.annotation.Nullable; -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; -import androidx.room.Index; - -import java.util.ArrayList; -import java.util.List; - -@Entity(tableName = "messages", - primaryKeys = {"profileId", "messageId"}, - indices = {@Index(value = {"profileId"})}) -public class Message { - public int profileId; - - @ColumnInfo(name = "messageId") - public long id; - - @ColumnInfo(name = "messageSubject") - public String subject; - @Nullable - @ColumnInfo(name = "messageBody") - public String body = null; - - public static final int TYPE_RECEIVED = 0; - public static final int TYPE_SENT = 1; - public static final int TYPE_DELETED = 2; - public static final int TYPE_DRAFT = 3; - @ColumnInfo(name = "messageType") - public int type = TYPE_RECEIVED; - - public long senderId = -1; // -1 for sent messages - public long senderReplyId = -1; - public boolean overrideHasAttachments = false; // if the attachments are not yet downloaded but we already know there are some - public List attachmentIds = null; - public List attachmentNames = null; - public List attachmentSizes = null; - - @Ignore - public Message() {} - - public Message(int profileId, long id, String subject, @Nullable String body, int type, long senderId, long senderReplyId) { - this.profileId = profileId; - this.id = id; - this.subject = subject; - this.body = body; - this.type = type; - this.senderId = senderId; - this.senderReplyId = senderReplyId; - } - - /** - * Add an attachment - * @param id attachment ID - * @param name file name incl. extension - * @param size file size or -1 if unknown - * @return a Message to which the attachment has been added - */ - public Message addAttachment(long id, String name, long size) { - if (attachmentIds == null) - attachmentIds = new ArrayList<>(); - if (attachmentNames == null) - attachmentNames = new ArrayList<>(); - if (attachmentSizes == null) - attachmentSizes = new ArrayList<>(); - attachmentIds.add(id); - attachmentNames.add(name); - attachmentSizes.add(size); - return this; - } - - public void clearAttachments() { - attachmentIds = null; - attachmentNames = null; - attachmentSizes = null; - } - - public Message setHasAttachments() { - overrideHasAttachments = true; - return this; - } - - public boolean hasAttachments() { - return overrideHasAttachments || (attachmentIds != null && attachmentIds.size() > 0); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageDao.java deleted file mode 100644 index e9110283..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageDao.java +++ /dev/null @@ -1,98 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.messages; - -import androidx.annotation.Nullable; -import androidx.lifecycle.LiveData; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; -import androidx.room.RawQuery; -import androidx.sqlite.db.SimpleSQLiteQuery; -import androidx.sqlite.db.SupportSQLiteQuery; - -import java.util.List; - -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata; - -import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_DELETED; -import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_RECEIVED; -import static pl.szczodrzynski.edziennik.data.db.modules.messages.Message.TYPE_SENT; -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_MESSAGE; - -@Dao -public abstract class MessageDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract long add(Message message); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract void addAll(List messageList); - - @Insert(onConflict = OnConflictStrategy.IGNORE) - public abstract void addAllIgnore(List messageList); - - @Query("DELETE FROM messages WHERE profileId = :profileId") - public abstract void clear(int profileId); - - @RawQuery(observedEntities = {Message.class}) - abstract LiveData> getAll(SupportSQLiteQuery query); - @RawQuery(observedEntities = {Message.class, Metadata.class}) - abstract List getNow(SupportSQLiteQuery query); - @RawQuery(observedEntities = {Message.class, Metadata.class}) - abstract MessageFull getOneNow(SupportSQLiteQuery query); - - public LiveData> getWithMetadataAndSenderName(int profileId, int messageType, String filter) { - return getAll(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS senderFullName\n" + - "FROM messages \n" + - "LEFT JOIN teachers ON teachers.profileId = "+profileId+" AND teacherId = senderId\n" + - "LEFT JOIN metadata ON messageId = thingId AND thingType = "+TYPE_MESSAGE+" AND metadata.profileId = "+profileId+"\n" + - "WHERE messages.profileId = "+profileId+" AND messageType = "+messageType+" AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - - public LiveData> getWithMetadata(int profileId, int messageType, String filter) { - return getAll(new SimpleSQLiteQuery("SELECT \n" + - "* \n" + - "FROM messages \n" + - "LEFT JOIN metadata ON messageId = thingId AND thingType = "+TYPE_MESSAGE+" AND metadata.profileId = "+profileId+"\n" + - "WHERE messages.profileId = "+profileId+" AND messageType = "+messageType+" AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - - @Nullable - public MessageFull getById(int profileId, long messageId) { - return getOneNow(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS senderFullName\n" + - "FROM messages \n" + - "LEFT JOIN teachers ON teachers.profileId = "+profileId+" AND teacherId = senderId\n" + - "LEFT JOIN metadata ON messageId = thingId AND thingType = "+TYPE_MESSAGE+" AND metadata.profileId = "+profileId+"\n" + - "WHERE messages.profileId = "+profileId+" AND messageId = "+messageId+"\n" + - "ORDER BY addedDate DESC")); - } - - public LiveData> getReceived(int profileId) { - return getWithMetadataAndSenderName(profileId, TYPE_RECEIVED, "1"); - } - public LiveData> getDeleted(int profileId) { - return getWithMetadataAndSenderName(profileId, TYPE_DELETED, "1"); - } - public LiveData> getSent(int profileId) { - return getWithMetadata(profileId, TYPE_SENT, "1"); - } - - public List getReceivedNow(int profileId, String filter) { - return getNow(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS senderFullName\n" + - "FROM messages \n" + - "LEFT JOIN teachers ON teachers.profileId = "+profileId+" AND teacherId = senderId\n" + - "LEFT JOIN metadata ON messageId = thingId AND thingType = "+TYPE_MESSAGE+" AND metadata.profileId = "+profileId+"\n" + - "WHERE messages.profileId = "+profileId+" AND messageType = 0 AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - public List getReceivedNotNotifiedNow(int profileId) { - return getReceivedNow(profileId, "notified = 0"); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageFull.java deleted file mode 100644 index 78eb7c70..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageFull.java +++ /dev/null @@ -1,26 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.messages; - -import androidx.annotation.Nullable; -import androidx.room.Ignore; - -import java.util.ArrayList; -import java.util.List; - -public class MessageFull extends Message { - public String senderFullName = null; - @Ignore - @Nullable - public List recipients = null; - - public MessageFull addRecipient(MessageRecipientFull recipient) { - if (recipients == null) - recipients = new ArrayList<>(); - recipients.add(recipient); - return this; - } - - // metadata - public boolean seen; - public boolean notified; - public long addedDate; -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageRecipientFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageRecipientFull.java deleted file mode 100644 index 69dbd54c..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/messages/MessageRecipientFull.java +++ /dev/null @@ -1,17 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.messages; - -public class MessageRecipientFull extends MessageRecipient { - public String fullName = null; - - public MessageRecipientFull(int profileId, long id, long replyId, long readDate, long messageId) { - super(profileId, id, replyId, readDate, messageId); - } - - public MessageRecipientFull(int profileId, long id, long messageId) { - super(profileId, id, messageId); - } - - public MessageRecipientFull() { - super(); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/Notice.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/Notice.java deleted file mode 100644 index f80ac904..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/Notice.java +++ /dev/null @@ -1,45 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.notices; - -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; -import androidx.room.Index; - -@Entity(tableName = "notices", - primaryKeys = {"profileId", "noticeId"}, - indices = {@Index(value = {"profileId"})}) -public class Notice { - public int profileId; - - @ColumnInfo(name = "noticeId") - public long id; - - @ColumnInfo(name = "noticeText") - public String text; - @ColumnInfo(name = "noticeSemester") - public int semester; - public static final int TYPE_NEUTRAL = 0; - public static final int TYPE_POSITIVE = 1; - public static final int TYPE_NEGATIVE = 2; - @ColumnInfo(name = "noticeType") - public int type = TYPE_NEUTRAL; - - public float points = 0; - public String category = null; - - public long teacherId; - - @Ignore - public Notice() {} - - public Notice(int profileId, long id, String text, int semester, int type, long teacherId) { - this.profileId = profileId; - this.id = id; - this.text = text; - this.semester = semester; - this.type = type; - this.teacherId = teacherId; - } -} - - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeDao.java deleted file mode 100644 index 0d6a28ec..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeDao.java +++ /dev/null @@ -1,66 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.notices; - -import androidx.lifecycle.LiveData; -import androidx.sqlite.db.SimpleSQLiteQuery; -import androidx.sqlite.db.SupportSQLiteQuery; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; -import androidx.room.RawQuery; - -import java.util.List; - -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata; - -import static pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata.TYPE_NOTICE; - -@Dao -public abstract class NoticeDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract long add(Notice notice); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - public abstract void addAll(List noticeList); - - @Query("DELETE FROM notices WHERE profileId = :profileId") - public abstract void clear(int profileId); - - @Query("DELETE FROM notices WHERE profileId = :profileId AND noticeSemester = :semester") - public abstract void clearForSemester(int profileId, int semester); - - @RawQuery(observedEntities = {Notice.class}) - abstract LiveData> getAll(SupportSQLiteQuery query); - public LiveData> getAll(int profileId, String filter) { - return getAll(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM notices \n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN metadata ON noticeId = thingId AND thingType = "+TYPE_NOTICE+" AND metadata.profileId = "+profileId+"\n" + - "WHERE notices.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - public LiveData> getAll(int profileId) { - return getAll(profileId, "1"); - } - public LiveData> getAllWhere(int profileId, String filter) { - return getAll(profileId, filter); - } - - @RawQuery(observedEntities = {Notice.class, Metadata.class}) - abstract List getAllNow(SupportSQLiteQuery query); - public List getAllNow(int profileId, String filter) { - return getAllNow(new SimpleSQLiteQuery("SELECT \n" + - "*, \n" + - "teachers.teacherName || ' ' || teachers.teacherSurname AS teacherFullName\n" + - "FROM notices \n" + - "LEFT JOIN teachers USING(profileId, teacherId)\n" + - "LEFT JOIN metadata ON noticeId = thingId AND thingType = "+TYPE_NOTICE+" AND metadata.profileId = "+profileId+"\n" + - "WHERE notices.profileId = "+profileId+" AND "+filter+"\n" + - "ORDER BY addedDate DESC")); - } - public List getNotNotifiedNow(int profileId) { - return getAllNow(profileId, "notified = 0"); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeFull.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeFull.java deleted file mode 100644 index 4fbf3119..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notices/NoticeFull.java +++ /dev/null @@ -1,10 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.notices; - -public class NoticeFull extends Notice { - public String teacherFullName = ""; - - // metadata - public boolean seen; - public boolean notified; - public long addedDate; -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/Notification.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/Notification.kt deleted file mode 100644 index 39f3d37f..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/notification/Notification.kt +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-18. - */ - -package pl.szczodrzynski.edziennik.data.db.modules.notification - -import android.content.Context -import android.content.Intent -import androidx.room.Entity -import androidx.room.PrimaryKey -import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.R -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_AUTO_ARCHIVING -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_ERROR -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_FEEDBACK_MESSAGE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_GENERAL -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_LUCKY_NUMBER -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_ANNOUNCEMENT -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_ATTENDANCE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_EVENT -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_GRADE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_HOMEWORK -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_MESSAGE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_NOTICE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_NEW_SHARED_EVENT -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_SERVER_MESSAGE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_TIMETABLE_CHANGED -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_TIMETABLE_LESSON_CHANGE -import pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.Companion.TYPE_UPDATE - -@Entity(tableName = "notifications") -data class Notification( - @PrimaryKey(autoGenerate = true) - val id: Int = 0, - - val title: String, - val text: String, - - val type: Int, - - val profileId: Int?, - val profileName: String?, - - var posted: Boolean = false, - - var viewId: Int? = null, - var extras: JsonObject? = null, - - val addedDate: Long = System.currentTimeMillis() -) { - companion object { - const val TYPE_GENERAL = 0 - const val TYPE_UPDATE = 1 - const val TYPE_ERROR = 2 - const val TYPE_TIMETABLE_CHANGED = 3 - const val TYPE_TIMETABLE_LESSON_CHANGE = 4 - const val TYPE_NEW_GRADE = 5 - const val TYPE_NEW_EVENT = 6 - const val TYPE_NEW_HOMEWORK = 10 - const val TYPE_NEW_SHARED_EVENT = 7 - const val TYPE_NEW_SHARED_HOMEWORK = 12 - const val TYPE_NEW_MESSAGE = 8 - const val TYPE_NEW_NOTICE = 9 - const val TYPE_NEW_ATTENDANCE = 13 - const val TYPE_SERVER_MESSAGE = 11 - const val TYPE_LUCKY_NUMBER = 14 - const val TYPE_NEW_ANNOUNCEMENT = 15 - const val TYPE_FEEDBACK_MESSAGE = 16 - const val TYPE_AUTO_ARCHIVING = 17 - } - - fun addExtra(key: String, value: Long?): Notification { - extras = extras ?: JsonObject() - extras?.addProperty(key, value) - return this - } - fun addExtra(key: String, value: String?): Notification { - extras = extras ?: JsonObject() - extras?.addProperty(key, value) - return this - } - - fun fillIntent(intent: Intent) { - if (profileId != -1) - intent.putExtra("profileId", profileId) - if (viewId != -1) - intent.putExtra("fragmentId", viewId) - try { - extras?.entrySet()?.forEach { (key, value) -> - if (!value.isJsonPrimitive) - return@forEach - val primitive = value.asJsonPrimitive - if (primitive.isNumber) { - intent.putExtra(key, primitive.asLong) - } else if (primitive.isString) { - intent.putExtra(key, primitive.asString) - } - } - } catch (e: NullPointerException) { - e.printStackTrace() - } - } -} - -fun Context.getNotificationTitle(type: Int): String { - return getString(when (type) { - TYPE_UPDATE -> R.string.notification_type_update - TYPE_ERROR -> R.string.notification_type_error - TYPE_TIMETABLE_CHANGED -> R.string.notification_type_timetable_change - TYPE_TIMETABLE_LESSON_CHANGE -> R.string.notification_type_timetable_lesson_change - TYPE_NEW_GRADE -> R.string.notification_type_new_grade - TYPE_NEW_EVENT -> R.string.notification_type_new_event - TYPE_NEW_HOMEWORK -> R.string.notification_type_new_homework - TYPE_NEW_SHARED_EVENT -> R.string.notification_type_new_shared_event - TYPE_NEW_MESSAGE -> R.string.notification_type_new_message - TYPE_NEW_NOTICE -> R.string.notification_type_notice - TYPE_NEW_ATTENDANCE -> R.string.notification_type_attendance - TYPE_SERVER_MESSAGE -> R.string.notification_type_server_message - TYPE_LUCKY_NUMBER -> R.string.notification_type_lucky_number - TYPE_FEEDBACK_MESSAGE -> R.string.notification_type_feedback_message - TYPE_NEW_ANNOUNCEMENT -> R.string.notification_type_new_announcement - TYPE_AUTO_ARCHIVING -> R.string.notification_type_auto_archiving - TYPE_GENERAL -> R.string.notification_type_general - else -> R.string.notification_type_general - }) -} \ No newline at end of file diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/Profile.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/Profile.kt deleted file mode 100644 index fabfef68..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/Profile.kt +++ /dev/null @@ -1,332 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.profiles - -import android.content.Context -import android.graphics.PorterDuff -import android.graphics.PorterDuffColorFilter -import android.graphics.drawable.Drawable -import android.net.ConnectivityManager -import android.widget.ImageView -import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory -import androidx.room.ColumnInfo -import androidx.room.Entity -import androidx.room.Ignore -import com.google.gson.JsonObject -import pl.droidsonroids.gif.GifDrawable -import pl.szczodrzynski.edziennik.colorFromName -import pl.szczodrzynski.edziennik.utils.models.Date -import pl.szczodrzynski.navlib.ImageHolder -import pl.szczodrzynski.navlib.R -import pl.szczodrzynski.navlib.drawer.IDrawerProfile -import pl.szczodrzynski.navlib.getDrawableFromRes - -@Entity(tableName = "profiles", primaryKeys = ["profileId"]) -open class Profile : IDrawerProfile { - - @ColumnInfo(name = "profileId") - override var id = -1 - override var name: String? = "" - override var subname: String? = null - override var image: String? = null - /*public String name = ""; - public String subname = null; - public String image = null;*/ - - var syncEnabled = true - var syncNotifications = true - var enableSharedEvents = true - var countInSeconds = false - var loggedIn = false - var empty = true - var archived = false - - /** - * The name of the student. - * This doesn't change, no matter if it's a parent or student account. - */ - var studentNameLong: String? = null - var studentNameShort: String? = null - /** - * The student's number in the class register. - */ - var studentNumber = -1 - var studentData: JsonObject? = null - - /** - * A full name of the account owner. - * If null, then it's a student account. - * If not null, then it's a parent account with this name. - */ - var accountNameLong: String? = null - - var studentClassName: String? = null - var studentSchoolYear: String? = null - - var registration = REGISTRATION_UNSPECIFIED - - var gradeColorMode = COLOR_MODE_WEIGHTED - var agendaViewType = AGENDA_DEFAULT - - var yearAverageMode = YEAR_ALL_GRADES - - var currentSemester = 1 - - var attendancePercentage: Float = 0.0f - - var dateSemester1Start: Date? = null - var dateSemester2Start: Date? = null - var dateYearEnd: Date? = null - - var luckyNumberEnabled = true - var luckyNumber = -1 - var luckyNumberDate: Date? = null - - //public Map> eventTypes; - - var loginStoreId = id - - var changedEndpoints: List? = null - - var disabledNotifications: List? = null - - var lastFullSync: Long = 0 - var lastReceiversSync: Long = 0 - - fun shouldFullSync(context: Context): Boolean { - val connManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - val mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI) - // if time since last full sync is > 7 days and wifi is connected - // or - // if time since last full sync is > 14 days, regardless of wifi state - return System.currentTimeMillis() - lastFullSync > 7 * 24 * 60 * 60 * 1000 && mWifi.isConnected || System.currentTimeMillis() - lastFullSync > 14 * 24 * 60 * 60 * 1000 - } - - @Ignore - constructor(id: Int, name: String, subname: String, loginStoreId: Int) : this() { - this.id = id - this.name = name - this.subname = subname - this.loginStoreId = loginStoreId - } - - constructor() { - //eventTypes = new HashMap<>(); - val today = Date.getToday() - val schoolYearStart = if (today.month < 9) today.year - 1 else today.year - dateSemester1Start = Date(schoolYearStart, 9, 1) - dateSemester2Start = Date(schoolYearStart + 1, 2, 1) - dateYearEnd = Date(schoolYearStart + 1, 6, 30) - } - - fun getSemesterStart(semester: Int): Date { - if (dateSemester1Start == null || dateSemester2Start == null || dateYearEnd == null) { - val today = Date.getToday() - val schoolYearStart = if (today.month < 9) today.year - 1 else today.year - dateSemester1Start = Date(schoolYearStart, 9, 1) - dateSemester2Start = Date(schoolYearStart + 1, 2, 1) - dateYearEnd = Date(schoolYearStart + 1, 6, 30) - } - - return if (semester == 1) - dateSemester1Start!! - else - dateSemester2Start!! - } - - fun getSemesterEnd(semester: Int): Date { - if (dateSemester1Start == null || dateSemester2Start == null || dateYearEnd == null) { - val today = Date.getToday() - val schoolYearStart = if (today.month < 9) today.year - 1 else today.year - dateSemester1Start = Date(schoolYearStart, 9, 1) - dateSemester2Start = Date(schoolYearStart + 1, 2, 1) - dateYearEnd = Date(schoolYearStart + 1, 6, 30) - } - - return if (semester == 1) - dateSemester2Start!!.clone().stepForward(0, 0, -1) - else - dateYearEnd!! - } - - fun dateToSemester(date: Date?): Int { - if (date == null) - return 1 - return if (date.value >= getSemesterStart(2).value) 2 else 1 - } - - @Ignore - constructor(context: Context) { - //RegisterEvent.checkPredefinedEventTypes(context, eventTypes); - } - - override fun getImageDrawable(context: Context): Drawable { - - if (!image.isNullOrEmpty()) { - try { - if (image?.endsWith(".gif", true) == true) { - return GifDrawable(image ?: "") - } - else { - return RoundedBitmapDrawableFactory.create(context.resources, image ?: "") - //return Drawable.createFromPath(image ?: "") ?: throw Exception() - } - } - catch (e: Exception) { - e.printStackTrace() - } - } - - return context.getDrawableFromRes(R.drawable.profile).also { - it.colorFilter = PorterDuffColorFilter(colorFromName(context, name), PorterDuff.Mode.DST_OVER) - } - - /*if (profileImage == null) { - profileImage = BitmapFactory.decodeResource(getResources(), pl.szczodrzynski.edziennik.R.drawable.profile); - } - profileImage = ThumbnailUtils.extractThumbnail(profileImage, Math.min(profileImage.getWidth(), profileImage.getHeight()), Math.min(profileImage.getWidth(), profileImage.getHeight())); - RoundedBitmapDrawable roundDrawable = RoundedBitmapDrawableFactory.create(getResources(), profileImage); - roundDrawable.setCircular(true); - return roundDrawable;*/ - } - override fun getImageHolder(context: Context): ImageHolder { - return if (!image.isNullOrEmpty()) { - try { - ImageHolder(image ?: "") - } catch (_: Exception) { - ImageHolder(R.drawable.profile, colorFromName(context, name)) - } - } - else { - ImageHolder(R.drawable.profile, colorFromName(context, name)) - } - } - override fun applyImageTo(imageView: ImageView) { - getImageHolder(imageView.context).applyTo(imageView) - } - - fun hasStudentData(key: String): Boolean { - if (studentData == null) - return false - return studentData?.has(key) ?: false - } - - fun getStudentData(key: String, defaultValue: String?): String? { - if (studentData == null) - return defaultValue - val element = studentData!!.get(key) - return if (element != null) { - element.asString - } else defaultValue - } - - fun getStudentData(key: String, defaultValue: Int): Int { - if (studentData == null) - return defaultValue - val element = studentData!!.get(key) - return element?.asInt ?: defaultValue - } - - fun getStudentData(key: String, defaultValue: Long): Long { - if (studentData == null) - return defaultValue - val element = studentData!!.get(key) - return element?.asLong ?: defaultValue - } - - fun getStudentData(key: String, defaultValue: Float): Float { - if (studentData == null) - return defaultValue - val element = studentData!!.get(key) - return element?.asFloat ?: defaultValue - } - - fun getStudentData(key: String, defaultValue: Boolean): Boolean { - if (studentData == null) - return defaultValue - val element = studentData!!.get(key) - return element?.asBoolean ?: defaultValue - } - - fun putStudentData(key: String, value: String?) { - if (studentData == null) - studentData = JsonObject() - studentData!!.addProperty(key, value) - } - - fun putStudentData(key: String, value: Int) { - if (studentData == null) - studentData = JsonObject() - studentData!!.addProperty(key, value) - } - - fun putStudentData(key: String, value: Long) { - if (studentData == null) - studentData = JsonObject() - studentData!!.addProperty(key, value) - } - - fun putStudentData(key: String, value: Float) { - if (studentData == null) - studentData = JsonObject() - studentData!!.addProperty(key, value) - } - - fun putStudentData(key: String, value: Boolean) { - if (studentData == null) - studentData = JsonObject() - studentData!!.addProperty(key, value) - } - - fun removeStudentData(key: String) { - if (studentData == null) - studentData = JsonObject() - studentData!!.remove(key) - } - - fun clearStudentStore() { - studentData = JsonObject() - } - - override fun toString(): String { - return "Profile{" + - "id=" + id + - ", name='" + name + '\''.toString() + - ", subname='" + subname + '\''.toString() + - ", image='" + image + '\''.toString() + - ", syncEnabled=" + syncEnabled + - ", syncNotifications=" + syncNotifications + - ", enableSharedEvents=" + enableSharedEvents + - ", empty=" + empty + - ", studentNameLong='" + studentNameLong + '\''.toString() + - ", studentNameShort='" + studentNameShort + '\''.toString() + - ", studentNumber=" + studentNumber + - ", studentData=" + studentData.toString() + - ", registration=" + registration + - ", gradeColorMode=" + gradeColorMode + - ", agendaViewType=" + agendaViewType + - ", currentSemester=" + currentSemester + - ", attendancePercentage=" + attendancePercentage + - ", dateSemester1Start=" + dateSemester1Start + - ", dateSemester2Start=" + dateSemester2Start + - ", dateYearEnd=" + dateYearEnd + - ", luckyNumberEnabled=" + luckyNumberEnabled + - ", luckyNumber=" + luckyNumber + - ", luckyNumberDate=" + luckyNumberDate + - ", loginStoreId=" + loginStoreId + - '}'.toString() - } - - companion object { - const val REGISTRATION_UNSPECIFIED = 0 - const val REGISTRATION_DISABLED = 1 - const val REGISTRATION_ENABLED = 2 - const val COLOR_MODE_DEFAULT = 0 - const val COLOR_MODE_WEIGHTED = 1 - const val AGENDA_DEFAULT = 0 - const val AGENDA_CALENDAR = 1 - const val YEAR_1_AVG_2_AVG = 0 - const val YEAR_1_SEM_2_AVG = 1 - const val YEAR_1_AVG_2_SEM = 2 - const val YEAR_1_SEM_2_SEM = 3 - const val YEAR_ALL_GRADES = 4 - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileDao.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileDao.java deleted file mode 100644 index cea18c81..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileDao.java +++ /dev/null @@ -1,74 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.profiles; - -import androidx.annotation.Nullable; -import androidx.lifecycle.LiveData; -import androidx.room.Dao; -import androidx.room.Insert; -import androidx.room.OnConflictStrategy; -import androidx.room.Query; - -import java.util.List; - -import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_ENABLED; - -@Dao -public interface ProfileDao { - @Insert(onConflict = OnConflictStrategy.REPLACE) - void add(Profile profile); - - @Insert(onConflict = OnConflictStrategy.REPLACE) - void addAll(List profileList); - - @Query("DELETE FROM profiles WHERE profileId = :profileId") - void remove(int profileId); - - @Query("SELECT profiles.*, loginStores.loginStoreType, loginStores.loginStoreData FROM profiles LEFT JOIN loginStores ON profiles.loginStoreId = loginStores.loginStoreId WHERE profileId = :profileId") - LiveData getById(int profileId); - - @Nullable - @Query("SELECT profiles.*, loginStores.loginStoreType, loginStores.loginStoreData FROM profiles LEFT JOIN loginStores ON profiles.loginStoreId = loginStores.loginStoreId WHERE profileId = :profileId") - ProfileFull getFullByIdNow(int profileId); - - @Query("SELECT* FROM profiles WHERE profileId = :profileId") - Profile getByIdNow(int profileId); - - @Query("SELECT * FROM profiles WHERE profileId >= 0 ORDER BY profileId") - LiveData> getAll(); - - @Query("SELECT * FROM profiles WHERE profileId >= 0 ORDER BY profileId") - List getAllNow(); - - @Query("SELECT profiles.*, loginStores.loginStoreType, loginStores.loginStoreData FROM profiles LEFT JOIN loginStores ON profiles.loginStoreId = loginStores.loginStoreId WHERE profileId >= 0 ORDER BY profileId") - LiveData> getAllFull(); - - @Query("SELECT profiles.*, loginStores.loginStoreType, loginStores.loginStoreData FROM profiles LEFT JOIN loginStores ON profiles.loginStoreId = loginStores.loginStoreId WHERE profileId >= 0 ORDER BY profileId") - List getAllFullNow(); - - @Query("SELECT profileId FROM profiles WHERE loginStoreId = :loginStoreId ORDER BY profileId") - List getIdsByLoginStoreIdNow(int loginStoreId); - - @Query("SELECT * FROM profiles WHERE syncEnabled = 1 AND archived = 0 AND profileId >= 0 ORDER BY profileId") - List getProfilesForSyncNow(); - - @Query("SELECT profileId FROM profiles WHERE syncEnabled = 1 AND archived = 0 AND profileId >= 0 ORDER BY profileId") - List getIdsForSyncNow(); - - @Query("SELECT profileId FROM profiles WHERE profileId >= 0 ORDER BY profileId") - List getIdsNow(); - - @Query("SELECT profiles.*, loginStores.* FROM teams JOIN profiles USING(profileId) LEFT JOIN loginStores ON profiles.loginStoreId = loginStores.loginStoreId WHERE teamCode = :teamCode AND registration = "+ REGISTRATION_ENABLED +" AND enableSharedEvents = 1") - List getByTeamCodeNowWithRegistration(String teamCode); - - @Query("SELECT profileId FROM profiles WHERE profileId >= 0 ORDER BY profileId ASC LIMIT 1") - int getFirstId(); - - @Query("SELECT profileId FROM profiles WHERE profileId >= 0 ORDER BY profileId DESC LIMIT 1") - int getLastId(); - - @Query("UPDATE profiles SET loginStoreId = :targetId WHERE loginStoreId = :sourceId") - void changeStoreId(int sourceId, int targetId); - - @Query("UPDATE profiles SET currentSemester = :semester WHERE profileId = :profileId") - void changeSemester(int profileId, int semester); -} - diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileFull.kt deleted file mode 100644 index ecbdafdb..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/profiles/ProfileFull.kt +++ /dev/null @@ -1,244 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.profiles - -import android.content.Context -import androidx.room.ColumnInfo -import androidx.room.Ignore -import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_AGENDA -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ANNOUNCEMENTS -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_HOMEWORK -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES -import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_TIMETABLE -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore -import pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.* -import java.util.* - -class ProfileFull : Profile { - @ColumnInfo(name = "loginStoreType") - var loginStoreType: Int = 0 - @ColumnInfo(name = "loginStoreData") - var loginStoreData: JsonObject? = null - - val usernameId: String - get() { - if (loginStoreData == null) { - return "NO_LOGIN_STORE" - } - if (studentData == null) { - return "NO_STUDENT_STORE" - } - return when (loginStoreType) { - LOGIN_TYPE_MOBIDZIENNIK -> getLoginData("serverName", "MOBI_UN") + ":" + getLoginData("username", "MOBI_UN") + ":" + getStudentData("studentId", -1) - LOGIN_TYPE_LIBRUS -> getStudentData("schoolName", "LIBRUS_UN") + ":" + getStudentData("accountLogin", "LIBRUS_LOGIN_UN") - LOGIN_TYPE_IUCZNIOWIE -> getLoginData("schoolName", "IUCZNIOWIE_UN") + ":" + getLoginData("username", "IUCZNIOWIE_UN") + ":" + getStudentData("registerId", -1) - LOGIN_TYPE_VULCAN -> getStudentData("schoolName", "VULCAN_UN") + ":" + getStudentData("studentId", -1) - LOGIN_TYPE_DEMO -> getLoginData("serverName", "DEMO_UN") + ":" + getLoginData("username", "DEMO_UN") + ":" + getStudentData("studentId", -1) - else -> "TYPE_UNKNOWN" - } - } - - // example (minimal) list of fragments - // there will never be less available options - val supportedFragments: List - get() { - val fragmentIds: MutableList - when (loginStoreType) { - LOGIN_TYPE_MOBIDZIENNIK, LOGIN_TYPE_DEMO, LOGIN_TYPE_VULCAN -> { - fragmentIds = ArrayList() - fragmentIds.add(DRAWER_ITEM_TIMETABLE) - fragmentIds.add(DRAWER_ITEM_AGENDA) - fragmentIds.add(DRAWER_ITEM_GRADES) - fragmentIds.add(DRAWER_ITEM_MESSAGES) - fragmentIds.add(DRAWER_ITEM_HOMEWORK) - fragmentIds.add(DRAWER_ITEM_BEHAVIOUR) - fragmentIds.add(DRAWER_ITEM_ATTENDANCE) - return fragmentIds - } - LOGIN_TYPE_LIBRUS -> { - fragmentIds = ArrayList() - fragmentIds.add(DRAWER_ITEM_TIMETABLE) - fragmentIds.add(DRAWER_ITEM_AGENDA) - fragmentIds.add(DRAWER_ITEM_GRADES) - fragmentIds.add(DRAWER_ITEM_MESSAGES) - fragmentIds.add(DRAWER_ITEM_HOMEWORK) - fragmentIds.add(DRAWER_ITEM_BEHAVIOUR) - fragmentIds.add(DRAWER_ITEM_ATTENDANCE) - fragmentIds.add(DRAWER_ITEM_ANNOUNCEMENTS) - return fragmentIds - } - LOGIN_TYPE_IUCZNIOWIE -> { - fragmentIds = ArrayList() - fragmentIds.add(DRAWER_ITEM_TIMETABLE) - fragmentIds.add(DRAWER_ITEM_AGENDA) - fragmentIds.add(DRAWER_ITEM_GRADES) - fragmentIds.add(DRAWER_ITEM_MESSAGES) - fragmentIds.add(DRAWER_ITEM_HOMEWORK) - fragmentIds.add(DRAWER_ITEM_BEHAVIOUR) - fragmentIds.add(DRAWER_ITEM_ATTENDANCE) - fragmentIds.add(DRAWER_ITEM_ANNOUNCEMENTS) - return fragmentIds - } - } - fragmentIds = ArrayList() - fragmentIds.add(DRAWER_ITEM_TIMETABLE) - fragmentIds.add(DRAWER_ITEM_AGENDA) - fragmentIds.add(DRAWER_ITEM_GRADES) - return fragmentIds - } - - constructor() : super() - - constructor(profile: Profile, loginStore: LoginStore) { - - /*Profile::class.memberProperties.forEach { profileProperty -> - if (profileProperty.visibility == KVisibility.PUBLIC) { - ProfileFull::class.memberProperties.singleOrNull { it.name == profileProperty.name }?.let { fullProperty -> - if (fullProperty is KMutableProperty<*>) { - fullProperty.setter.call(this, profileProperty.get(profile)) - } - } - } - }*/ - - Profile::class.java.declaredFields.forEach { profileProperty -> - profileProperty.isAccessible = true - profileProperty.set(this, profileProperty.get(profile)) - } - - this.loginStoreType = loginStore.type - this.loginStoreId = loginStore.id - this.loginStoreData = loginStore.data - /*for (Field field: LoginStore.class.getFields()) { - try { - ProfileFull.class.getField(field.getName()).set(this, field.get(loginStore)); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - }*/ - } - - constructor(context: Context) : super(context) - - @Ignore - constructor(id: Int, name: String, subname: String, loginStoreId: Int) : super(id, name, subname, loginStoreId) - - fun canChangeLoginPassword(): Boolean { - return loginStoreType == LOGIN_TYPE_MOBIDZIENNIK || loginStoreType == LOGIN_TYPE_LIBRUS || loginStoreType == LOGIN_TYPE_IUCZNIOWIE - } - - fun changeLoginPassword(password: String) { - if (loginStoreData == null) { - return - } - if (studentData == null) { - return - } - when (loginStoreType) { - LOGIN_TYPE_MOBIDZIENNIK, LOGIN_TYPE_LIBRUS, LOGIN_TYPE_IUCZNIOWIE -> putLoginData("password", password) - } - } - - - fun getLoginData(key: String, defaultValue: String): String { - if (loginStoreData == null) - return defaultValue - val element = loginStoreData!!.get(key) - return if (element != null) { - element.asString - } else defaultValue - } - - fun getLoginData(key: String, defaultValue: Int): Int { - if (loginStoreData == null) - return defaultValue - val element = loginStoreData!!.get(key) - return element?.asInt ?: defaultValue - } - - fun getLoginData(key: String, defaultValue: Long): Long { - if (loginStoreData == null) - return defaultValue - val element = loginStoreData!!.get(key) - return element?.asLong ?: defaultValue - } - - fun getLoginData(key: String, defaultValue: Float): Float { - if (loginStoreData == null) - return defaultValue - val element = loginStoreData!!.get(key) - return element?.asFloat ?: defaultValue - } - - fun getLoginData(key: String, defaultValue: Boolean): Boolean { - if (loginStoreData == null) - return defaultValue - val element = loginStoreData!!.get(key) - return element?.asBoolean ?: defaultValue - } - - fun putLoginData(key: String, value: String) { - forceLoginStore() - loginStoreData!!.addProperty(key, value) - } - - fun putLoginData(key: String, value: Int) { - forceLoginStore() - loginStoreData!!.addProperty(key, value) - } - - fun putLoginData(key: String, value: Long) { - forceLoginStore() - loginStoreData!!.addProperty(key, value) - } - - fun putLoginData(key: String, value: Float) { - forceLoginStore() - loginStoreData!!.addProperty(key, value) - } - - fun putLoginData(key: String, value: Boolean) { - forceLoginStore() - loginStoreData!!.addProperty(key, value) - } - - fun removeLoginData(key: String) { - if (loginStoreData == null) - return - loginStoreData!!.remove(key) - } - - fun clearLoginStore() { - loginStoreData = JsonObject() - } - - private fun forceLoginStore() { - if (loginStoreData == null) { - clearLoginStore() - } - } - - fun loginStoreType(): String { - return when (loginStoreType) { - LOGIN_TYPE_MOBIDZIENNIK -> "LOGIN_TYPE_MOBIDZIENNIK" - LOGIN_TYPE_LIBRUS -> "LOGIN_TYPE_LIBRUS" - LOGIN_TYPE_IUCZNIOWIE -> "LOGIN_TYPE_IDZIENNIK" - LOGIN_TYPE_VULCAN -> "LOGIN_TYPE_VULCAN" - LOGIN_TYPE_DEMO -> "LOGIN_TYPE_DEMO" - else -> "LOGIN_TYPE_UNKNOWN" - } - } - - override fun toString(): String { - return "ProfileFull{" + - "parent=" + super.toString() + - "loginStoreId=" + loginStoreId + - ", loginStoreType=" + loginStoreType() + - ", loginStoreData=" + loginStoreData + - '}'.toString() - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/Teacher.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/Teacher.java deleted file mode 100644 index ba7e84c6..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/Teacher.java +++ /dev/null @@ -1,189 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.teachers; - -import android.content.Context; -import android.graphics.Bitmap; - -import java.util.List; - -import androidx.annotation.NonNull; -import androidx.room.ColumnInfo; -import androidx.room.Entity; -import androidx.room.Ignore; - -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.utils.Utils; - -import static pl.szczodrzynski.edziennik.utils.Utils.bs; -import static pl.szczodrzynski.edziennik.utils.Utils.ns; - -@Entity(tableName = "teachers", - primaryKeys = {"profileId", "teacherId"}) -public class Teacher { - public int profileId; - - @ColumnInfo(name = "teacherId") - public long id; - - @ColumnInfo(name = "teacherLoginId") - public String loginId = null; - - @ColumnInfo(name = "teacherName") - public String name; - @ColumnInfo(name = "teacherSurname") - public String surname; - - @ColumnInfo(name = "teacherType") - public int type; - public static final int TYPE_TEACHER = 0; // 1 - public static final int TYPE_EDUCATOR = 1; // 2 - public static final int TYPE_PEDAGOGUE = 2; // 4 - public static final int TYPE_LIBRARIAN = 3; // 8 - public static final int TYPE_SECRETARIAT = 4; // 16 - public static final int TYPE_PRINCIPAL = 5; // 32 - public static final int TYPE_SCHOOL_ADMIN = 6; // 64 - // not teachers - public static final int TYPE_SUPER_ADMIN = 7; // 128 - public static final int TYPE_STUDENT = 8; // 256 - public static final int TYPE_PARENT = 9; // 512 - public static final int TYPE_PARENTS_COUNCIL = 10; // 1024 - public static final int TYPE_SCHOOL_PARENTS_COUNCIL = 11; // 2048 - public static final int TYPE_OTHER = 12; // 4096 - public static final int IS_TEACHER_MASK = 0b1111111; - @ColumnInfo(name = "teacherTypeDescription") - public String typeDescription = null; - - public boolean isType(int checkingType) { - return (type & (1 << checkingType)) >= 1; - } - public boolean isTeacher() { - return type <= IS_TEACHER_MASK; - } - public void setType(int setType) { - type |= (1 << setType); - } - public void unsetType(int unsetType) { - type &= ~(1 << unsetType); - } - - public static String typeString(Context c, int type) { - return typeString(c, type, null); - } - public static String typeString(Context c, int type, String typeDescription) { - String suffix = bs(" - ", typeDescription); - switch (type) { - default: - case TYPE_TEACHER: - return c.getString(R.string.teacher_teacher)+suffix; - case TYPE_PARENTS_COUNCIL: - return c.getString(R.string.teacher_parents_council)+suffix; - case TYPE_SCHOOL_PARENTS_COUNCIL: - return c.getString(R.string.teacher_school_parents_council)+suffix; - case TYPE_PEDAGOGUE: - return c.getString(R.string.teacher_pedagogue)+suffix; - case TYPE_LIBRARIAN: - return c.getString(R.string.teacher_librarian)+suffix; - case TYPE_SCHOOL_ADMIN: - return c.getString(R.string.teacher_school_admin)+suffix; - case TYPE_SUPER_ADMIN: - return c.getString(R.string.teacher_super_admin)+suffix; - case TYPE_SECRETARIAT: - return c.getString(R.string.teacher_secretariat)+suffix; - case TYPE_PRINCIPAL: - return c.getString(R.string.teacher_principal)+suffix; - case TYPE_EDUCATOR: - return c.getString(R.string.teacher_educator)+suffix; - case TYPE_PARENT: - return c.getString(R.string.teacher_parent)+suffix; - case TYPE_STUDENT: - return c.getString(R.string.teacher_student)+suffix; - case TYPE_OTHER: - return c.getString(R.string.teacher_other)+suffix; - } - } - public String getType(Context c) { - return typeString(c, Utils.leftmostSetBit(type), typeDescription); - } - - @Ignore - public Bitmap image = null; - @Ignore - public String displayName = null; - - @Ignore - public Teacher(int profileId, long id, String name, String surname) { - this.profileId = profileId; - this.id = id; - this.name = name; - this.surname = surname; - } - - public Teacher(int profileId, long id, String name, String surname, String loginId) { - this.profileId = profileId; - this.id = id; - this.name = name; - this.surname = surname; - this.loginId = loginId; - } - - public String getFullName() - { - return name+" "+surname; - } - public String getFullNameLastFirst() - { - return surname+" "+name; - } - - public String getShortName() - { - return (name.length() == 0 ? " " : name.charAt(0))+"."+surname; - } - - // USED IN IUCZNIOWIE + getRecipientList - public static Teacher getById(List teacherList, long id) - { - for (Teacher teacher: teacherList) { - if (teacher.id == id) - { - return teacher; - } - } - return null; - } - public static Teacher getByFullName(List teacherList, String name) - { - for (Teacher teacher: teacherList) { - if ((teacher.name + " " + teacher.surname).equals(name)) - { - return teacher; - } - } - return null; - } - public static Teacher getByFullNameLastFirst(List teacherList, String name) - { - for (Teacher teacher: teacherList) { - if ((teacher.surname + " " + teacher.name).equals(name)) - { - return teacher; - } - } - return null; - } - public static Teacher getByShortName(List teacherList, String shortName) /* F.Lastname */ - { - for (Teacher teacher: teacherList) { - if (teacher.name.length() > 0 && ((teacher.name.charAt(0) + "." + teacher.surname).equals(shortName))) - { - return teacher; - } - } - return null; - } - - @NonNull - @Override - public String toString() { - return getFullName(); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsence.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsence.kt deleted file mode 100644 index c73dc490..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsence.kt +++ /dev/null @@ -1,37 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.teachers - -import androidx.room.ColumnInfo -import androidx.room.Entity -import pl.szczodrzynski.edziennik.utils.models.Date -import pl.szczodrzynski.edziennik.utils.models.Time - -@Entity(tableName = "teacherAbsence", - primaryKeys = ["profileId", "teacherAbsenceId"]) -open class TeacherAbsence ( - - val profileId: Int, - - @ColumnInfo(name = "teacherAbsenceId") - val id: Long, - - val teacherId: Long, - - @ColumnInfo(name = "teacherAbsenceType") - val type: Long, - - @ColumnInfo(name = "teacherAbsenceName") - val name: String?, - - @ColumnInfo(name = "teacherAbsenceDateFrom") - val dateFrom: Date, - - @ColumnInfo(name = "teacherAbsenceDateTo") - val dateTo: Date, - - @ColumnInfo(name = "teacherAbsenceTimeFrom") - val timeFrom: Time?, - - @ColumnInfo(name = "teacherAbsenceTimeTo") - val timeTo: Time? - -) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceDao.kt deleted file mode 100644 index 898d03f7..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceDao.kt +++ /dev/null @@ -1,40 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.teachers - -import androidx.lifecycle.LiveData -import androidx.room.Dao -import androidx.room.Insert -import androidx.room.OnConflictStrategy -import androidx.room.Query -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.utils.models.Date - -@Dao -interface TeacherAbsenceDao { - - @Insert(onConflict = OnConflictStrategy.REPLACE) - fun add(teacherAbsence: TeacherAbsence) - - @Insert(onConflict = OnConflictStrategy.REPLACE) - fun addAll(teacherAbsenceList: List) - - @Query("SELECT * FROM teacherAbsence WHERE profileId = :profileId") - fun getAll(profileId: Int): List - - @Query("SELECT *, teachers.teacherName || ' ' || teachers.teacherSurname as teacherFullName, " + - "metadata.seen, metadata.notified, metadata.addedDate FROM teacherAbsence " + - "LEFT JOIN teachers USING (profileId, teacherId) " + - "LEFT JOIN metadata ON teacherAbsenceId = thingId AND metadata.thingType = " + Metadata.TYPE_TEACHER_ABSENCE + - " AND metadata.profileId = :profileId WHERE teachers.profileId = :profileId") - fun getAllFullNow(profileId: Int): List - - @Query("SELECT *, teachers.teacherName || ' ' || teachers.teacherSurname as teacherFullName, " + - "metadata.seen, metadata.notified, metadata.addedDate FROM teacherAbsence " + - "LEFT JOIN teachers USING (profileId, teacherId) " + - "LEFT JOIN metadata ON teacherAbsenceId = thingId AND metadata.thingType = " + Metadata.TYPE_TEACHER_ABSENCE + - " AND metadata.profileId = :profileId WHERE teachers.profileId = :profileId " + - "AND :date BETWEEN teacherAbsenceDateFrom AND teacherAbsenceDateTo") - fun getAllByDateFull(profileId: Int, date: Date): LiveData> - - @Query("DELETE FROM teacherAbsence WHERE profileId = :profileId") - fun clear(profileId: Int) -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceFull.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceFull.kt deleted file mode 100644 index 800f2d00..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/teachers/TeacherAbsenceFull.kt +++ /dev/null @@ -1,16 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.teachers - -import pl.szczodrzynski.edziennik.utils.models.Date -import pl.szczodrzynski.edziennik.utils.models.Time - -class TeacherAbsenceFull(profileId: Int, id: Long, teacherId: Long, type: Long, name: String?, - dateFrom: Date, dateTo: Date, timeFrom: Time?, timeTo: Time?) - : TeacherAbsence(profileId, id, teacherId, type, name, dateFrom, dateTo, timeFrom, timeTo) { - - var teacherFullName = "" - - // metadata - var seen: Boolean = false - var notified: Boolean = false - var addedDate: Long = 0 -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt deleted file mode 100644 index 540fdc49..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt +++ /dev/null @@ -1,104 +0,0 @@ -package pl.szczodrzynski.edziennik.data.db.modules.timetable - -import androidx.lifecycle.LiveData -import androidx.room.Dao -import androidx.room.Insert -import androidx.room.OnConflictStrategy -import androidx.room.Query -import pl.szczodrzynski.edziennik.data.db.modules.metadata.Metadata -import pl.szczodrzynski.edziennik.utils.models.Date - -@Dao -interface TimetableDao { - companion object { - private const val QUERY = """ - SELECT - timetable.*, - subjects.subjectLongName AS subjectName, - teachers.teacherName ||" "|| teachers.teacherSurname AS teacherName, - teams.teamName AS teamName, - oldS.subjectLongName AS oldSubjectName, - oldT.teacherName ||" "|| oldT.teacherSurname AS oldTeacherName, - oldG.teamName AS oldTeamName, - metadata.seen, metadata.notified, metadata.addedDate - FROM timetable - LEFT JOIN subjects USING(profileId, subjectId) - LEFT JOIN teachers USING(profileId, teacherId) - LEFT JOIN teams USING(profileId, teamId) - LEFT JOIN subjects AS oldS ON timetable.profileId = oldS.profileId AND timetable.oldSubjectId = oldS.subjectId - LEFT JOIN teachers AS oldT ON timetable.profileId = oldT.profileId AND timetable.oldTeacherId = oldT.teacherId - LEFT JOIN teams AS oldG ON timetable.profileId = oldG.profileId AND timetable.oldTeamId = oldG.teamId - LEFT JOIN metadata ON id = thingId AND thingType = ${Metadata.TYPE_LESSON_CHANGE} AND metadata.profileId = timetable.profileId - """ - } - - @Insert(onConflict = OnConflictStrategy.REPLACE) - operator fun plusAssign(lessonList: List) - - @Query("DELETE FROM timetable WHERE profileId = :profileId") - fun clear(profileId: Int) - - @Query("DELETE FROM timetable WHERE profileId = :profileId AND ((type != 3 AND date >= :dateFrom) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom))") - fun clearFromDate(profileId: Int, dateFrom: Date) - @Query("DELETE FROM timetable WHERE profileId = :profileId AND ((type != 3 AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate <= :dateTo))") - fun clearToDate(profileId: Int, dateTo: Date) - @Query("DELETE FROM timetable WHERE profileId = :profileId AND ((type != 3 AND date >= :dateFrom AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom AND oldDate <= :dateTo))") - fun clearBetweenDates(profileId: Int, dateFrom: Date, dateTo: Date) - - @Query(""" - $QUERY - WHERE timetable.profileId = :profileId AND ((type != 3 AND date = :date) OR ((type = 3 OR type = 1) AND oldDate = :date)) - ORDER BY id, type - """) - fun getForDate(profileId: Int, date: Date) : LiveData> - - @Query(""" - $QUERY - WHERE timetable.profileId = :profileId AND ((type != 3 AND date = :date) OR ((type = 3 OR type = 1) AND oldDate = :date)) - ORDER BY id, type - """) - fun getForDateNow(profileId: Int, date: Date) : List - - @Query(""" - $QUERY - WHERE timetable.profileId = :profileId AND ((type != 3 AND date > :today) OR ((type = 3 OR type = 1) AND oldDate > :today)) AND timetable.subjectId = :subjectId - ORDER BY id, type - LIMIT 1 - """) - fun getNextWithSubject(profileId: Int, today: Date, subjectId: Long) : LiveData - - @Query(""" - $QUERY - WHERE timetable.profileId = :profileId AND ((type != 3 AND date > :today) OR ((type = 3 OR type = 1) AND oldDate > :today)) AND timetable.subjectId = :subjectId AND timetable.teamId = :teamId - ORDER BY id, type - LIMIT 1 - """) - fun getNextWithSubjectAndTeam(profileId: Int, today: Date, subjectId: Long, teamId: Long): LiveData - - @Query(""" - $QUERY - WHERE (type != 3 AND date >= :dateFrom AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom AND oldDate <= :dateTo) - ORDER BY profileId, id, type - """) - fun getBetweenDatesNow(dateFrom: Date, dateTo: Date) : List - - @Query(""" - $QUERY - WHERE (type != 3 AND date >= :dateFrom AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom AND oldDate <= :dateTo) - ORDER BY profileId, id, type - """) - fun getBetweenDates(dateFrom: Date, dateTo: Date) : LiveData> - - @Query(""" - $QUERY - WHERE timetable.profileId = :profileId AND timetable.id = :lessonId - ORDER BY id, type - """) - fun getByIdNow(profileId: Int, lessonId: Long) : LessonFull? - - @Query(""" - $QUERY - WHERE timetable.profileId = :profileId AND timetable.type NOT IN (${Lesson.TYPE_NORMAL}, ${Lesson.TYPE_NO_LESSONS}, ${Lesson.TYPE_SHIFTED_SOURCE}) AND metadata.notified = 0 - """) - fun getNotNotifiedNow(profileId: Int): List -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseSendException.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseSendException.kt new file mode 100644 index 00000000..04cb7c23 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseSendException.kt @@ -0,0 +1,24 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-11. + */ + +package pl.szczodrzynski.edziennik.data.firebase + +class FirebaseSendException(reason: String?) : Exception(reason) { + companion object { + const val ERROR_UNKNOWN = 0 + const val ERROR_INVALID_PARAMETERS = 1 + const val ERROR_SIZE = 2 + const val ERROR_TTL_EXCEEDED = 3 + const val ERROR_TOO_MANY_MESSAGES = 4 + } + + val errorCode = when (reason) { + "service_not_available" -> ERROR_TTL_EXCEEDED + "toomanymessages" -> ERROR_TOO_MANY_MESSAGES + "invalid_parameters" -> ERROR_INVALID_PARAMETERS + "messagetoobig" -> ERROR_SIZE + "missing_to" -> ERROR_INVALID_PARAMETERS + else -> ERROR_UNKNOWN + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseService.kt new file mode 100644 index 00000000..6396a87c --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/FirebaseService.kt @@ -0,0 +1,193 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-11. + */ + +package pl.szczodrzynski.edziennik.data.firebase + +import android.annotation.SuppressLint +import android.app.PendingIntent +import android.app.PendingIntent.CanceledException +import android.content.Intent +import android.util.Log +import com.google.firebase.iid.zzad +import com.google.firebase.iid.zzaz +import com.google.firebase.messaging.zzc +import com.google.gson.JsonObject +import pl.szczodrzynski.edziennik.* +import java.util.* +import com.google.firebase.messaging.zzo.zza as logNotificationOpen +import com.google.firebase.messaging.zzo.zza as logNotificationReceived +import com.google.firebase.messaging.zzo.zzb as logNotificationDismiss +import com.google.firebase.messaging.zzo.zzd as shouldUploadMetrics + +@SuppressLint("Registered") +open class FirebaseService : zzc() { + companion object { + private const val TAG = "FirebaseService" + } + + private val messageQueue = ArrayDeque(10) + + open fun onMessageReceived(message: Message) = Unit + open fun onDeletedMessages() = Unit + open fun onMessageSent(messageId: String?) = Unit + open fun onSendError(messageId: String?, exception: Exception) = Unit + open fun onNewToken(token: String?) = Unit + + // apparently this gets the correct intent from some + // kind of queue inside Firebase's InstanceID Receiver + final override fun zza(intent: Intent?) = zzaz.zza()?.zzb() + final override fun zzb(intent: Intent?): Boolean { + val action = intent?.action + if (action == "com.google.firebase.messaging.NOTIFICATION_OPEN") { + intent.getParcelableExtra("pending_intent")?.let { + try { + it.send() + } catch (e: CanceledException) { + Log.e(TAG, "Notification pending intent canceled") + } + } + + if (shouldUploadMetrics(intent)) { + logNotificationOpen(intent) + } + + return true + } + return false + } + final override fun zzc(intent: Intent?) { + val action = intent?.action + val json = intent?.toJsonObject() + Log.d(TAG, "zzc Intent(action=$action, extras=$json)") + if (action == null || json == null) + return + + when (action) { + "com.google.firebase.messaging.NOTIFICATION_DISMISS" -> { + if (shouldUploadMetrics(intent)) { + logNotificationDismiss(intent) + } + } + "com.google.firebase.messaging.NEW_TOKEN" -> { + onNewToken(json.getString("token")) + } + "com.google.android.c2dm.intent.RECEIVE", + "com.google.firebase.messaging.RECEIVE_DIRECT_BOOT" -> { + val messageId = json.getString("google.message_id") + if (messageId != null) { + // send back an acknowledgement to Google Play Services + val ackBundle = Bundle( + "google.message_id" to messageId + ) + zzad.zza(this).zza(2, ackBundle) + } + // check for duplicate message + // and add it to queue + if (messageId.isNotNullNorEmpty()) { + if (messageQueue.contains(messageId)) { + Log.d(TAG, "Received duplicate message: $messageId") + return + } + if (messageQueue.size >= 10) + messageQueue.remove() + messageQueue += messageId + } + // process the received message + processMessage(messageId, json, intent) + } + else -> { + Log.d(TAG, "Unknown intent action: $action") + } + } + } + + private fun processMessage(messageId: String?, json: JsonObject, intent: Intent) { + // remove something that the original FMS removes + json.remove("androidx.contentpager.content.wakelockid") + + // get the message type + when (val it = json.getString("message_type") ?: "gcm") { + "gcm" -> { // 0 + if (shouldUploadMetrics(intent)) { + logNotificationReceived(intent, null) + } + + onMessageReceived(Message(messageId, json)) + } + "deleted_messages" -> { // 1 + onDeletedMessages() + } + "send_event" -> { // 2 + onMessageSent(messageId) + } + "send_error" -> { // 3 + onSendError( + messageId ?: json.getString("message_id"), + FirebaseSendException(json.getString("error")) + ) + } + else -> { + Log.w(TAG, "Received message with unknown type: $it") + return + } + } + } + + data class Message(val messageId: String?, private val json: JsonObject) { + val data = json.deepCopy() + val from by lazy { s("test.from") ?: s("from") ?: "" } + val to by lazy { s("google.to") } + val messageType by lazy { s("message_type") } + val collapseKey by lazy { s("collapse_key") } + val sentTime by lazy { l("google.sent_time") } + val ttl by lazy { i("google.ttl") } + val originalPriority by lazy { getPriority(s("google.original_priority") ?: s("priority")) } + val priority by lazy { getPriority( + s("google.delivered_priority") ?: if (i("google.priority_reduced") == 1) + "normal" + else s("google.priority") + ) } + val isNotificationMessage by lazy { isNotificationMessage(json) } + val notificationTitle by lazy { s("gcm.notification.title") } + val notificationText by lazy { s("gcm.notification.body") } + + init { + data.also { + val toRemove = mutableListOf() + it.keySet().forEach { key -> + if (key.startsWith("google.") + || key.startsWith("gcm.") + || key == "from" + || key == "message_type" + || key == "collapse_key") + toRemove += key + } + toRemove.forEach { key -> + it.remove(key) + } + } + } + + private fun s(key: String): String? = json.getString(key) + private fun l(key: String): Long = json.getLong(key) ?: 0L + private fun i(key: String): Int = json.getInt(key) ?: 0 + private fun isNotificationMessage(json: JsonObject): Boolean { + return json.getInt("gcm.n.e") == 1 + || json.getInt("gcm.notification.e") == 1 + || json.getString("gcm.n.icon") != null + || json.getString("gcm.notification.icon") != null + } + private fun getPriority(str: String?): Int { + return when (str) { + "high" -> 1 + "normal" -> 2 + else -> 0 + } + } + + override fun toString(): String { + return "Message(messageId=$messageId, from=$from, data=$data)" + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/MyFirebaseService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/MyFirebaseService.kt new file mode 100644 index 00000000..00d33812 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/MyFirebaseService.kt @@ -0,0 +1,48 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-11. + */ + +package pl.szczodrzynski.edziennik.data.firebase + +import android.content.Context +import android.util.Log +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch +import pl.szczodrzynski.edziennik.App +import kotlin.coroutines.CoroutineContext + +class MyFirebaseService : FirebaseService(), CoroutineScope { + companion object { + private const val TAG = "MyFirebaseService" + } + + private val app by lazy { applicationContext as App } + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + override fun onNewToken(token: String?) { + Log.d(TAG, "Got new token: $token") + app.config.sync.tokenApp = token + } + + override fun onMessageReceived(message: Message) { + launch(Dispatchers.Default) { + Log.d(TAG, "Message received from ${message.from}: $message") + app.getSharedPreferences("firebase_service_log", Context.MODE_PRIVATE).edit().apply { + putString(System.currentTimeMillis().toString(), message.toString()) + apply() + } + val profiles = app.db.profileDao().profilesForFirebaseNow + when (message.from) { + "640759989760" -> SzkolnyAppFirebase(app, profiles, message) + "747285019373" -> SzkolnyMobidziennikFirebase(app, profiles, message) + "513056078587" -> SzkolnyLibrusFirebase(app, profiles, message) + "987828170337" -> SzkolnyVulcanFirebase(app, profiles, message) + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt new file mode 100644 index 00000000..111fef4a --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyAppFirebase.kt @@ -0,0 +1,206 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-11. + */ + +package pl.szczodrzynski.edziennik.data.firebase + +import com.google.gson.JsonParser +import com.google.gson.reflect.TypeToken +import kotlinx.coroutines.* +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.events.FeedbackMessageEvent +import pl.szczodrzynski.edziennik.data.api.events.RegisterAvailabilityEvent +import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus +import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update +import pl.szczodrzynski.edziennik.data.api.task.PostNotifications +import pl.szczodrzynski.edziennik.data.db.entity.* +import pl.szczodrzynski.edziennik.sync.UpdateWorker +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time +import kotlin.coroutines.CoroutineContext + +class SzkolnyAppFirebase(val app: App, val profiles: List, val message: FirebaseService.Message) : CoroutineScope { + companion object { + private const val TAG = "SzkolnyAppFirebase" + } + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + init { + run { + val type = message.data.getString("type") ?: return@run + when (type) { + "sharedEvent" -> sharedEvent( + message.data.getString("shareTeamCode") ?: return@run, + message.data.getString("event") ?: return@run, + message.data.getString("message") ?: return@run + ) + "unsharedEvent" -> unsharedEvent( + message.data.getString("unshareTeamCode") ?: return@run, + message.data.getLong("eventId") ?: return@run, + message.data.getString("message") ?: return@run + ) + "serverMessage", + "unpairedBrowser" -> serverMessage( + message.data.getString("title") ?: "", + message.data.getString("message") ?: "" + ) + "appUpdate" -> launch { UpdateWorker.runNow(app, app.gson.fromJson(message.data.getString("update"), Update::class.java)) } + "feedbackMessage" -> launch { + val message = app.gson.fromJson(message.data.getString("message"), FeedbackMessage::class.java) ?: return@launch + feedbackMessage(message) + } + "registerAvailability" -> launch { + val data = app.gson.fromJson>( + message.data.getString("registerAvailability"), + object: TypeToken>(){}.type + ) ?: return@launch + app.config.sync.registerAvailability = data + if (EventBus.getDefault().hasSubscriberForEvent(RegisterAvailabilityEvent::class.java)) { + EventBus.getDefault().postSticky(RegisterAvailabilityEvent()) + } + } + } + } + } + + private fun serverMessage(title: String, message: String) { + val notification = Notification( + id = System.currentTimeMillis(), + title = title, + text = message, + type = Notification.TYPE_SERVER_MESSAGE, + profileId = null, + profileName = title + ).addExtra("action", "serverMessage").addExtra("serverMessageTitle", title).addExtra("serverMessageText", message) + app.db.notificationDao().add(notification) + PostNotifications(app, listOf(notification)) + } + + private suspend fun feedbackMessage(message: FeedbackMessage) { + if (message.deviceId == app.deviceId) { + message.deviceId = null + message.deviceName = null + } + withContext(Dispatchers.Default) { + app.db.feedbackMessageDao().add(message) + if (!EventBus.getDefault().hasSubscriberForEvent(FeedbackMessageEvent::class.java)) { + val notification = Notification( + id = System.currentTimeMillis(), + title = "Wiadomość od ${message.senderName}", + text = message.text, + type = Notification.TYPE_FEEDBACK_MESSAGE, + profileId = null, + profileName = "Wiadomość od ${message.senderName}" + ).addExtra("action", "feedbackMessage").addExtra("feedbackMessageDeviceId", message.deviceId) + app.db.notificationDao().add(notification) + PostNotifications(app, listOf(notification)) + } + EventBus.getDefault().postSticky(FeedbackMessageEvent(message)) + } + } + + private fun sharedEvent(teamCode: String, jsonStr: String, message: String) { + val json = JsonParser().parse(jsonStr).asJsonObject + val teams = app.db.teamDao().allNow + // not used, as the server provides a sharing message + //val eventTypes = app.db.eventTypeDao().allNow + + val events = mutableListOf() + val metadataList = mutableListOf() + val notificationList = mutableListOf() + + teams.filter { it.code == teamCode }.distinctBy { it.profileId }.forEach { team -> + val profile = profiles.firstOrNull { it.id == team.profileId } ?: return@forEach + if (profile.registration != Profile.REGISTRATION_ENABLED) + return@forEach + val event = Event( + profileId = team.profileId, + id = json.getLong("id") ?: return, + date = json.getInt("eventDate")?.let { Date.fromValue(it) } ?: return, + time = json.getInt("startTime")?.let { Time.fromValue(it) }, + topic = json.getString("topic") ?: "", + color = json.getInt("color"), + type = json.getLong("type") ?: 0, + teacherId = json.getLong("teacherId") ?: -1, + subjectId = json.getLong("subjectId") ?: -1, + teamId = team.id, + addedDate = json.getLong("addedDate") ?: System.currentTimeMillis() + ) + if (event.color == -1) + event.color = null + + event.sharedBy = json.getString("sharedBy") + event.sharedByName = json.getString("sharedByName") + if (profile.userCode == event.sharedBy) event.sharedBy = "self" + + val metadata = Metadata( + event.profileId, + if (event.type == Event.TYPE_HOMEWORK) Metadata.TYPE_HOMEWORK else Metadata.TYPE_EVENT, + event.id, + false, + true + ) + + val type = if (event.type == Event.TYPE_HOMEWORK) Notification.TYPE_NEW_SHARED_HOMEWORK else Notification.TYPE_NEW_SHARED_EVENT + val notificationFilter = app.config.getFor(event.profileId).sync.notificationFilter + + if (!notificationFilter.contains(type)) { + val notification = Notification( + id = Notification.buildId(event.profileId, type, event.id), + title = app.getNotificationTitle(type), + text = message, + type = type, + profileId = profile.id, + profileName = profile.name, + viewId = if (event.type == Event.TYPE_HOMEWORK) MainActivity.DRAWER_ITEM_HOMEWORK else MainActivity.DRAWER_ITEM_AGENDA, + addedDate = event.addedDate + ).addExtra("eventId", event.id).addExtra("eventDate", event.date.value.toLong()) + notificationList += notification + } + + events += event + metadataList += metadata + } + app.db.eventDao().upsertAll(events) + app.db.metadataDao().addAllReplace(metadataList) + if (notificationList.isNotEmpty()) { + app.db.notificationDao().addAll(notificationList) + PostNotifications(app, notificationList) + } + } + + private fun unsharedEvent(teamCode: String, eventId: Long, message: String) { + val teams = app.db.teamDao().allNow + val notificationList = mutableListOf() + + teams.filter { it.code == teamCode }.distinctBy { it.profileId }.forEach { team -> + val profile = profiles.firstOrNull { it.id == team.profileId } ?: return@forEach + if (profile.registration != Profile.REGISTRATION_ENABLED) + return@forEach + val notificationFilter = app.config.getFor(team.profileId).sync.notificationFilter + + if (!notificationFilter.contains(Notification.TYPE_REMOVED_SHARED_EVENT)) { + val notification = Notification( + id = Notification.buildId(profile.id + ?: 0, Notification.TYPE_REMOVED_SHARED_EVENT, eventId), + title = app.getNotificationTitle(Notification.TYPE_REMOVED_SHARED_EVENT), + text = message, + type = Notification.TYPE_REMOVED_SHARED_EVENT, + profileId = profile.id, + profileName = profile.name, + viewId = MainActivity.DRAWER_ITEM_AGENDA + ) + notificationList += notification + } + app.db.eventDao().remove(team.profileId, eventId) + } + if (notificationList.isNotEmpty()) { + app.db.notificationDao().addAll(notificationList) + PostNotifications(app, notificationList) + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyLibrusFirebase.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyLibrusFirebase.kt new file mode 100644 index 00000000..cc59faf4 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyLibrusFirebase.kt @@ -0,0 +1,69 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-11. + */ + +package pl.szczodrzynski.edziennik.data.firebase + +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_LIBRUS +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask +import pl.szczodrzynski.edziennik.data.api.edziennik.librus.* +import pl.szczodrzynski.edziennik.data.api.task.IApiTask +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.getString + +class SzkolnyLibrusFirebase(val app: App, val profiles: List, val message: FirebaseService.Message) { + /*{ + "gcm.notification.e": "1", + "userId": "1234567u", + "gcm.notification.sound": "default", + "gcm.notification.title": "Synergia", + "gcm.notification.sound2": "notify", + "image": "www/assets/images/iconPush_01.png", + "gcm.notification.body": "Dodano nieobecność nauczyciela od godziny 15:30 do godziny 16:15", + "gcm.notification.icon": "notification_event.png", + "objectType": "Calendars/TeacherFreeDays", + }*/ + init { run { + val type = message.data.getString("objectType") ?: return@run + val accountLogin = message.data.getString("userId")?.replace("u", "") ?: return@run + + /* ./src/store/modules/helpers/change-processor.js */ + val endpoints = when (type) { + "Notes" -> listOf(ENDPOINT_LIBRUS_API_NOTICES) + "Grades" -> listOf(ENDPOINT_LIBRUS_API_NORMAL_GRADES, ENDPOINT_LIBRUS_API_NORMAL_GRADE_CATEGORIES, ENDPOINT_LIBRUS_API_NORMAL_GRADE_COMMENTS) + "PointGrades" -> listOf(ENDPOINT_LIBRUS_API_POINT_GRADES, ENDPOINT_LIBRUS_API_POINT_GRADE_CATEGORIES) + "DescriptiveGrades" -> listOf(ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADES) + "DescriptiveGrades/Text/Categories" -> listOf(ENDPOINT_LIBRUS_API_DESCRIPTIVE_GRADE_CATEGORIES) + "DescriptiveTextGrades" -> listOf(ENDPOINT_LIBRUS_API_DESCRIPTIVE_TEXT_GRADES) + "TextGrades" -> listOf(ENDPOINT_LIBRUS_API_TEXT_GRADES) + "BehaviourGrades/Points" -> listOf(ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADES, ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_CATEGORIES, ENDPOINT_LIBRUS_API_BEHAVIOUR_GRADE_COMMENTS) + "BehaviourGrades" -> listOf() + "Attendances" -> listOf(ENDPOINT_LIBRUS_API_ATTENDANCES) + "HomeWorks" -> listOf(ENDPOINT_LIBRUS_API_EVENTS) + "ParentTeacherConferences" -> listOf(ENDPOINT_LIBRUS_API_PT_MEETINGS) + "Calendars/ClassFreeDays" -> listOf(ENDPOINT_LIBRUS_API_CLASS_FREE_DAYS) + "Calendars/TeacherFreeDays" -> listOf(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS) + "Calendars/SchoolFreeDays" -> listOf(ENDPOINT_LIBRUS_API_SCHOOL_FREE_DAYS) + "Calendars/Substitutions" -> listOf(ENDPOINT_LIBRUS_API_TIMETABLES) + "HomeWorkAssignments" -> listOf(ENDPOINT_LIBRUS_API_HOMEWORK, ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK) + "SchoolNotices" -> listOf(ENDPOINT_LIBRUS_API_ANNOUNCEMENTS) + "Messages" -> listOf(ENDPOINT_LIBRUS_MESSAGES_RECEIVED) + "LuckyNumbers" -> listOf(ENDPOINT_LIBRUS_API_LUCKY_NUMBER) + "Timetables" -> listOf(ENDPOINT_LIBRUS_API_TIMETABLES) + else -> return@run + } + + if (endpoints.isEmpty()) + return@run + + val tasks = profiles.filter { + it.loginStoreType == LOGIN_TYPE_LIBRUS && + it.getStudentData("accountLogin", "")?.replace("u", "") == accountLogin + }.map { + EdziennikTask.syncProfile(it.id, listOf(MainActivity.DRAWER_ITEM_HOME to 0), onlyEndpoints = endpoints) + } + IApiTask.enqueueAll(app, tasks) + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyMobidziennikFirebase.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyMobidziennikFirebase.kt new file mode 100644 index 00000000..b097dbed --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyMobidziennikFirebase.kt @@ -0,0 +1,71 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-11. + */ + +package pl.szczodrzynski.edziennik.data.firebase + +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_ATTENDANCE +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_BEHAVIOUR +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_GRADES +import pl.szczodrzynski.edziennik.MainActivity.Companion.DRAWER_ITEM_MESSAGES +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_MOBIDZIENNIK +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask +import pl.szczodrzynski.edziennik.data.api.task.IApiTask +import pl.szczodrzynski.edziennik.data.db.entity.Message.Companion.TYPE_RECEIVED +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.getLong +import pl.szczodrzynski.edziennik.getString + +class SzkolnyMobidziennikFirebase(val app: App, val profiles: List, val message: FirebaseService.Message) { + /*{ + "id": "123456", + "body": "Janósz Kowalski (Nauczyciele) - Temat wiadomości", + "icon": "push", + "type": "wiadOdebrana", + "color": "#025b8e", + "login": "1234@2019@szkola", + "notId": "1234567", + "sound": "default", + "title": "Nowa wiadomość - mobiDziennik", + "global_id": "123456", + "vibrate": "true", + "sync_url": "https://szkola.mobidziennik.pl/api2/logowanie" + }*/ + /*{ + "body": "Kowalski Janósz - zapowiedziany sprawdzian na jutro:\njęzyk niemiecki (kartkówka - nieregularne 2)", + "icon": "push", + "type": "sprawdzianyJutro", + "color": "#025b8e", + "login": "1234@2019@szkola", + "notId": "1234567", + "sound": "default", + "title": "Sprawdziany jutro - mobiDziennik", + "global_id": "123456", + "vibrate": "true", + "sync_url": "https://szkola.mobidziennik.pl/api2/logowanie" + }*/ + init { run { + val type = message.data.getString("type") ?: return@run + if (type == "sprawdzianyJutro" || type == "zadaniaJutro" || type == "autoryzacjaUrzadzenia") + return@run + val globalId = message.data.getLong("global_id") + + /* assets/www/js/push.js */ + val viewIdPair = when (type) { + "wiadOdebrana" -> DRAWER_ITEM_MESSAGES to TYPE_RECEIVED + "oceny", "ocenyKoncowe", "zachowanie" -> DRAWER_ITEM_GRADES to 0 + "uwagi" -> DRAWER_ITEM_BEHAVIOUR to 0 + "nieobecnoscPierwszaLekcja", "nieobecnosciDzisiaj" -> DRAWER_ITEM_ATTENDANCE to 0 + else -> return@run + } + + val tasks = profiles.filter { + it.loginStoreType == LOGIN_TYPE_MOBIDZIENNIK && + it.getStudentData("globalId", 0L) == globalId + }.map { + EdziennikTask.syncProfile(it.id, listOf(viewIdPair)) + } + IApiTask.enqueueAll(app, tasks) + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyVulcanFirebase.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyVulcanFirebase.kt new file mode 100644 index 00000000..06c2f171 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/firebase/SzkolnyVulcanFirebase.kt @@ -0,0 +1,54 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-11. + */ + +package pl.szczodrzynski.edziennik.data.firebase + +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.LOGIN_TYPE_VULCAN +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask +import pl.szczodrzynski.edziennik.data.api.task.IApiTask +import pl.szczodrzynski.edziennik.data.db.entity.Message +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import java.util.* + +class SzkolnyVulcanFirebase(val app: App, val profiles: List, val message: FirebaseService.Message) { + /*{ + "data": { + "loginid": 12345, + "pupilid": 1234, + "unitid": 2, + "event": "CDC", + "day": "2019-09-09", + "table": "Frekwencja" + }, + "title": "Frekwencja", + "message: "Uczeń Janósz otrzymał nieobecność na 7 lekcji" + }*/ + init { run { + val data = message.data.getString("data")?.toJsonObject() ?: return@run + val type = data.getString("table") ?: return@run + val studentId = data.getInt("pupilid") + val loginId = data.getInt("loginid") + + /* pl.vulcan.uonetmobile.auxilary.enums.CDCPushEnum */ + val viewIdPair = when (type.toLowerCase(Locale.ROOT)) { + "wiadomosc" -> MainActivity.DRAWER_ITEM_MESSAGES to Message.TYPE_RECEIVED + "ocena" -> MainActivity.DRAWER_ITEM_GRADES to 0 + "uwaga" -> MainActivity.DRAWER_ITEM_BEHAVIOUR to 0 + "frekwencja" -> MainActivity.DRAWER_ITEM_ATTENDANCE to 0 + // this type is not even implemented in Dzienniczek+ + "sprawdzian" -> MainActivity.DRAWER_ITEM_AGENDA to 0 + else -> return@run + } + + val tasks = profiles.filter { + it.loginStoreType == LOGIN_TYPE_VULCAN + && (it.getStudentData("studentId", 0) == studentId + || it.getStudentData("studentLoginId", 0) == loginId) + }.map { + EdziennikTask.syncProfile(it.id, listOf(viewIdPair)) + } + IApiTask.enqueueAll(app, tasks) + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/network/NetworkUtils.java b/app/src/main/java/pl/szczodrzynski/edziennik/network/NetworkUtils.java deleted file mode 100644 index 796925fd..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/network/NetworkUtils.java +++ /dev/null @@ -1,142 +0,0 @@ -package pl.szczodrzynski.edziennik.network; - -import android.content.Context; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.os.Build; - -import pl.szczodrzynski.edziennik.App; - -import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_DISABLED; -import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED; -import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_WHITELISTED; - -public class NetworkUtils { - private App app; - - public NetworkUtils(App _app) - { - this.app = _app; - } - - public boolean isOnline() { - assert app != null; - ConnectivityManager cm = - (ConnectivityManager) app.getContext().getSystemService(Context.CONNECTIVITY_SERVICE); - assert cm != null; - NetworkInfo netInfo = cm.getActiveNetworkInfo(); - return netInfo != null && netInfo.isConnectedOrConnecting(); - } - - public int checkBackgroundDataRestricted() { - - ConnectivityManager connMgr = (ConnectivityManager) app.getContext().getSystemService(Context.CONNECTIVITY_SERVICE); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - assert connMgr != null; - switch (connMgr.getRestrictBackgroundStatus()) { - case RESTRICT_BACKGROUND_STATUS_ENABLED: - return 2; - - case RESTRICT_BACKGROUND_STATUS_WHITELISTED: - return 1; - - case RESTRICT_BACKGROUND_STATUS_DISABLED: - return 0; - } - } - else - { - return 0; - } - return 0; - } - - /*public void setSelfSignedSSL(Context mContext, @Nullable String instanceName){ - try { - CertificateFactory cf = CertificateFactory.getInstance("X.509"); - // cert file stored in \app\src\main\assets - Log.d("ION", "certificate: before"); - AssetManager am = mContext.getAssets(); - InputStream caInput = new BufferedInputStream(am.open("certificate.cer")); - Log.d("ION", "certificate: after"); - - Certificate ca = cf.generateCertificate(caInput); - caInput.close(); - - KeyStore keyStore = KeyStore.getInstance("BKS"); - keyStore.load(null, null); - keyStore.setCertificateEntry("ca", ca); - - String tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm(); - TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmfAlgorithm); - tmf.init(keyStore); - - TrustManager[] wrappedTrustManagers = getWrappedTrustManagers(tmf.getTrustManagers()); - - SSLContext sslContext = SSLContext.getInstance("TLS"); - sslContext.init(null, wrappedTrustManagers, null); - - AsyncSSLSocketMiddleware sslMiddleWare; - if(TextUtils.isEmpty(instanceName)){ - sslMiddleWare = Ion.getDefault(mContext).getHttpClient().getSSLSocketMiddleware(); - }else { - sslMiddleWare = Ion - .getInstance(mContext, instanceName) - .getHttpClient().getSSLSocketMiddleware(); - } - sslMiddleWare.setTrustManagers(wrappedTrustManagers); - sslMiddleWare.setHostnameVerifier(getHostnameVerifier()); - sslMiddleWare.setSSLContext(sslContext); - }catch (Exception e){ - e.printStackTrace(); - } - } - - private HostnameVerifier getHostnameVerifier() { - return new HostnameVerifier() { - @Override - public boolean verify(String hostname, SSLSession session) { - return true; - // or the following: - // HostnameVerifier hv = HttpsURLConnection.getDefaultHostnameVerifier(); - // return hv.verify("www.yourserver.com", session); - } - }; - } - - public TrustManager[] getWrappedTrustManagers(TrustManager[] trustManagers) { - final X509TrustManager originalTrustManager = (X509TrustManager) trustManagers[0]; - return new TrustManager[]{ - new X509TrustManager() { - public X509Certificate[] getAcceptedIssuers() { - return originalTrustManager.getAcceptedIssuers(); - } - - public void checkClientTrusted(X509Certificate[] certs, String authType) { - try { - if (certs != null && certs.length > 0){ - certs[0].checkValidity(); - } else { - originalTrustManager.checkClientTrusted(certs, authType); - } - } catch (CertificateException e) { - Log.w("checkClientTrusted", e.toString()); - } - } - - public void checkServerTrusted(X509Certificate[] certs, String authType) { - try { - if (certs != null && certs.length > 0){ - certs[0].checkValidity(); - } else { - originalTrustManager.checkServerTrusted(certs, authType); - } - } catch (CertificateException e) { - Log.w("checkServerTrusted", e.toString()); - } - } - } - }; - }*/ -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java b/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java deleted file mode 100644 index bfc96343..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/network/ServerRequest.java +++ /dev/null @@ -1,141 +0,0 @@ -package pl.szczodrzynski.edziennik.network; - -import android.os.Build; -import android.os.Looper; -import android.provider.Settings; -import android.util.Pair; - -import com.google.gson.JsonObject; - -import java.util.ArrayList; -import java.util.List; - -import im.wangchao.mhttp.Request; -import im.wangchao.mhttp.Response; -import im.wangchao.mhttp.ThreadMode; -import im.wangchao.mhttp.callback.JsonCallbackHandler; -import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.BuildConfig; -import pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile; -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull; -import pl.szczodrzynski.edziennik.utils.Utils; - -import static pl.szczodrzynski.edziennik.data.db.modules.profiles.Profile.REGISTRATION_ENABLED; - -public class ServerRequest { - private App app; - private String url; - private List> params; - private String username = ""; - private String source = ""; - - public ServerRequest(App app, String url, String source) { - this(app, url, source, app.profile); - } - - public ServerRequest(App app, String url, String source, ProfileFull profileFull) { - this(app, url, source, profileFull, profileFull == null ? -1 : profileFull.getLoginStoreType(), profileFull == null ? "" : profileFull.getUsernameId()); - } - - public ServerRequest(App app, String url, String source, Profile profile, int loginStoreType, String usernameId) { - this.app = app; - this.url = url; - this.params = new ArrayList<>(); - this.username = (profile != null && profile.getRegistration() == REGISTRATION_ENABLED ? usernameId : app.deviceId); - this.source = source; - if (profile != null && profile.getRegistration() == REGISTRATION_ENABLED) { - this.setBodyParameter("login_type", Integer.toString(loginStoreType)); - this.setBodyParameter("name_long", profile.getStudentNameLong()); - this.setBodyParameter("name_short", profile.getStudentNameShort()); - //if (Looper.myLooper() == Looper.getMainLooper()) { - if (Looper.getMainLooper().getThread() == Thread.currentThread()) { - this.setBodyParameter("team_ids", "UI_THREAD"); - } - else { - this.setBodyParameter("team_ids", app.gson.toJson(app.db.teamDao().getAllCodesNow(profile.getId()))); - } - } - } - - public ServerRequest withUsername(String username) { - this.username = username; - return this; - } - - public ServerRequest setBodyParameter(String name, String value) { - params.add(new Pair<>(name, value)); - return this; - } - - public interface JsonCallback { - void onCallback(Exception e, JsonObject result); - } - - private String sign(String signature, long timestamp) { - String password = "Y3plZ29fdHVfc3p1a2Fzeg=="+ BuildConfig.VERSION_CODE + timestamp; - return Utils.HmacMD5(password, signature); - } - - public void run(JsonCallback callback) { - long timestamp = System.currentTimeMillis() / 1000; - Request.builder() - .url(url) - .callbackThreadMode(ThreadMode.MAIN) - .userAgent("Szkolny.eu/"+BuildConfig.VERSION_NAME+" (Android "+Build.VERSION.RELEASE+"; "+Build.MANUFACTURER+" "+Build.MODEL+")") - .addParams(params) - .addParameter("username", username) - .addParameter("app_version_build_type", BuildConfig.BUILD_TYPE) - .addParameter("app_version_code", Integer.toString(BuildConfig.VERSION_CODE)) - .addParameter("app_version", BuildConfig.VERSION_NAME + " " + BuildConfig.BUILD_TYPE + " (" + BuildConfig.VERSION_CODE + ")") - .addParameter("device_id", Settings.Secure.getString(app.getContext().getContentResolver(), Settings.Secure.ANDROID_ID)) - .addParameter("device_model", Build.MANUFACTURER+" "+Build.MODEL) - .addParameter("device_os_version", Build.VERSION.RELEASE) - .addParameter("fcm_token", app.config.getSync().getTokenApp()) - .addParameter("signature", sign(app.signature, timestamp)) - .addParameter("signature_timestamp", timestamp) - .addParameter("package_name", "pl.szczodrzynski.edziennik") - .addParameter("source", source) - .addParameter("update_frequency", app.config.getSync().getEnabled() ? app.config.getSync().getInterval() : -1) - .post() - .callback(new JsonCallbackHandler() { - @Override - public void onSuccess(JsonObject data, im.wangchao.mhttp.Response response) { - super.onSuccess(data, response); - callback.onCallback(null, data); - } - - @Override - public void onFailure(im.wangchao.mhttp.Response response, Throwable throwable) { - super.onFailure(response, throwable); - callback.onCallback(throwable instanceof Exception ? (Exception) throwable : null, null); - } - }) - .build() - .enqueue(); - } - public JsonObject runSync() throws Exception { - long timestamp = System.currentTimeMillis() / 1000; - Response response = Request.builder() - .url(url) - .callbackThreadMode(ThreadMode.MAIN) - .userAgent("Szkolny.eu/"+BuildConfig.VERSION_NAME+" (Android "+Build.VERSION.RELEASE+"; "+Build.MANUFACTURER+" "+Build.MODEL+")") - .addParams(params) - .addParameter("username", username) - .addParameter("app_version_build_type", BuildConfig.BUILD_TYPE) - .addParameter("app_version_code", Integer.toString(BuildConfig.VERSION_CODE)) - .addParameter("app_version", BuildConfig.VERSION_NAME + " " + BuildConfig.BUILD_TYPE + " (" + BuildConfig.VERSION_CODE + ")") - .addParameter("device_id", Settings.Secure.getString(app.getContext().getContentResolver(), Settings.Secure.ANDROID_ID)) - .addParameter("device_model", Build.MANUFACTURER+" "+Build.MODEL) - .addParameter("device_os_version", Build.VERSION.RELEASE) - .addParameter("fcm_token", app.config.getSync().getTokenApp()) - .addParameter("signature", sign(app.signature, timestamp)) - .addParameter("signature_timestamp", timestamp) - .addParameter("package_name", "pl.szczodrzynski.edziennik") - .addParameter("source", source) - .addParameter("update_frequency", app.config.getSync().getEnabled() ? app.config.getSync().getInterval() : -1) - .post() - .build() - .execute(); - return new JsonCallbackHandler().backgroundParser(response); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/network/TLSSocketFactory.java b/app/src/main/java/pl/szczodrzynski/edziennik/network/TLSSocketFactory.java deleted file mode 100644 index 7cae49a2..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/network/TLSSocketFactory.java +++ /dev/null @@ -1,421 +0,0 @@ -package pl.szczodrzynski.edziennik.network; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.InetAddress; -import java.net.Socket; -import java.net.SocketAddress; -import java.net.SocketException; -import java.net.UnknownHostException; -import java.nio.channels.SocketChannel; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.net.ssl.HandshakeCompletedListener; -import javax.net.ssl.SSLSession; -import javax.net.ssl.SSLSocket; -import javax.net.ssl.SSLSocketFactory; - -/** - * Enables TLS v1.2 when creating SSLSockets. - *

    - * For some reason, android supports TLS v1.2 from API 16, but enables it by - * default only from API 20. - * @link https://developer.android.com/reference/javax/net/ssl/SSLSocket.html - * @see SSLSocketFactory - */ -public class TLSSocketFactory extends SSLSocketFactory { - private static final String[] TLS_V12 = {"TLSv1.2"}; - private static final String[] TLS_V11_V12 = {"TLSv1.1", "TLSv1.2"}; - private static final String[] TLS_V10_V11_V12 = {"TLSv1", "TLSv1.1", "TLSv1.2"}; - - private final SSLSocketFactory delegate; - - public TLSSocketFactory(SSLSocketFactory base) { - this.delegate = base; - } - - @Override - public String[] getDefaultCipherSuites() { - return delegate.getDefaultCipherSuites(); - } - - @Override - public String[] getSupportedCipherSuites() { - return delegate.getSupportedCipherSuites(); - } - - @Override - public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException { - return patch(delegate.createSocket(s, host, port, autoClose)); - } - - @Override - public Socket createSocket(String host, int port) throws IOException, UnknownHostException { - return patch(delegate.createSocket(host, port)); - } - - @Override - public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException, UnknownHostException { - return patch(delegate.createSocket(host, port, localHost, localPort)); - } - - @Override - public Socket createSocket(InetAddress host, int port) throws IOException { - return patch(delegate.createSocket(host, port)); - } - - @Override - public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException { - return patch(delegate.createSocket(address, port, localAddress, localPort)); - } - - private Socket patch(Socket socket) { - if (socket instanceof SSLSocket) { - ((SSLSocket) socket).setEnabledProtocols(TLS_V10_V11_V12); - //socket = new NoSSLv3SSLSocket((SSLSocket) socket); - } - return socket; - } - - - public class DelegateSSLSocket extends SSLSocket { - - protected final SSLSocket delegate; - - DelegateSSLSocket(SSLSocket delegate) { - this.delegate = delegate; - } - - @Override - public String[] getSupportedCipherSuites() { - return delegate.getSupportedCipherSuites(); - } - - @Override - public String[] getEnabledCipherSuites() { - return delegate.getEnabledCipherSuites(); - } - - @Override - public void setEnabledCipherSuites(String[] suites) { - delegate.setEnabledCipherSuites(suites); - } - - @Override - public String[] getSupportedProtocols() { - return delegate.getSupportedProtocols(); - } - - @Override - public String[] getEnabledProtocols() { - return delegate.getEnabledProtocols(); - } - - @Override - public void setEnabledProtocols(String[] protocols) { - delegate.setEnabledProtocols(protocols); - } - - @Override - public SSLSession getSession() { - return delegate.getSession(); - } - - @Override - public void addHandshakeCompletedListener(HandshakeCompletedListener listener) { - delegate.addHandshakeCompletedListener(listener); - } - - @Override - public void removeHandshakeCompletedListener(HandshakeCompletedListener listener) { - delegate.removeHandshakeCompletedListener(listener); - } - - @Override - public void startHandshake() throws IOException { - delegate.startHandshake(); - } - - @Override - public void setUseClientMode(boolean mode) { - delegate.setUseClientMode(mode); - } - - @Override - public boolean getUseClientMode() { - return delegate.getUseClientMode(); - } - - @Override - public void setNeedClientAuth(boolean need) { - delegate.setNeedClientAuth(need); - } - - @Override - public void setWantClientAuth(boolean want) { - delegate.setWantClientAuth(want); - } - - @Override - public boolean getNeedClientAuth() { - return delegate.getNeedClientAuth(); - } - - @Override - public boolean getWantClientAuth() { - return delegate.getWantClientAuth(); - } - - @Override - public void setEnableSessionCreation(boolean flag) { - delegate.setEnableSessionCreation(flag); - } - - @Override - public boolean getEnableSessionCreation() { - return delegate.getEnableSessionCreation(); - } - - @Override - public void bind(SocketAddress localAddr) throws IOException { - delegate.bind(localAddr); - } - - @Override - public synchronized void close() throws IOException { - delegate.close(); - } - - @Override - public void connect(SocketAddress remoteAddr) throws IOException { - delegate.connect(remoteAddr); - } - - @Override - public void connect(SocketAddress remoteAddr, int timeout) throws IOException { - delegate.connect(remoteAddr, timeout); - } - - @Override - public SocketChannel getChannel() { - return delegate.getChannel(); - } - - @Override - public InetAddress getInetAddress() { - return delegate.getInetAddress(); - } - - @Override - public InputStream getInputStream() throws IOException { - return delegate.getInputStream(); - } - - @Override - public boolean getKeepAlive() throws SocketException { - return delegate.getKeepAlive(); - } - - @Override - public InetAddress getLocalAddress() { - return delegate.getLocalAddress(); - } - - @Override - public int getLocalPort() { - return delegate.getLocalPort(); - } - - @Override - public SocketAddress getLocalSocketAddress() { - return delegate.getLocalSocketAddress(); - } - - @Override - public boolean getOOBInline() throws SocketException { - return delegate.getOOBInline(); - } - - @Override - public OutputStream getOutputStream() throws IOException { - return delegate.getOutputStream(); - } - - @Override - public int getPort() { - return delegate.getPort(); - } - - @Override - public synchronized int getReceiveBufferSize() throws SocketException { - return delegate.getReceiveBufferSize(); - } - - @Override - public SocketAddress getRemoteSocketAddress() { - return delegate.getRemoteSocketAddress(); - } - - @Override - public boolean getReuseAddress() throws SocketException { - return delegate.getReuseAddress(); - } - - @Override - public synchronized int getSendBufferSize() throws SocketException { - return delegate.getSendBufferSize(); - } - - @Override - public int getSoLinger() throws SocketException { - return delegate.getSoLinger(); - } - - @Override - public synchronized int getSoTimeout() throws SocketException { - return delegate.getSoTimeout(); - } - - @Override - public boolean getTcpNoDelay() throws SocketException { - return delegate.getTcpNoDelay(); - } - - @Override - public int getTrafficClass() throws SocketException { - return delegate.getTrafficClass(); - } - - @Override - public boolean isBound() { - return delegate.isBound(); - } - - @Override - public boolean isClosed() { - return delegate.isClosed(); - } - - @Override - public boolean isConnected() { - return delegate.isConnected(); - } - - @Override - public boolean isInputShutdown() { - return delegate.isInputShutdown(); - } - - @Override - public boolean isOutputShutdown() { - return delegate.isOutputShutdown(); - } - - @Override - public void sendUrgentData(int value) throws IOException { - delegate.sendUrgentData(value); - } - - @Override - public void setKeepAlive(boolean keepAlive) throws SocketException { - delegate.setKeepAlive(keepAlive); - } - - @Override - public void setOOBInline(boolean oobinline) throws SocketException { - delegate.setOOBInline(oobinline); - } - - @Override - public void setPerformancePreferences(int connectionTime, int latency, int bandwidth) { - delegate.setPerformancePreferences(connectionTime, latency, bandwidth); - } - - @Override - public synchronized void setReceiveBufferSize(int size) throws SocketException { - delegate.setReceiveBufferSize(size); - } - - @Override - public void setReuseAddress(boolean reuse) throws SocketException { - delegate.setReuseAddress(reuse); - } - - @Override - public synchronized void setSendBufferSize(int size) throws SocketException { - delegate.setSendBufferSize(size); - } - - @Override - public void setSoLinger(boolean on, int timeout) throws SocketException { - delegate.setSoLinger(on, timeout); - } - - @Override - public synchronized void setSoTimeout(int timeout) throws SocketException { - delegate.setSoTimeout(timeout); - } - - @Override - public void setTcpNoDelay(boolean on) throws SocketException { - delegate.setTcpNoDelay(on); - } - - @Override - public void setTrafficClass(int value) throws SocketException { - delegate.setTrafficClass(value); - } - - @Override - public void shutdownInput() throws IOException { - delegate.shutdownInput(); - } - - @Override - public void shutdownOutput() throws IOException { - delegate.shutdownOutput(); - } - - @Override - public String toString() { - return delegate.toString(); - } - - @Override - public boolean equals(Object o) { - return delegate.equals(o); - } - } - - private class NoSSLv3SSLSocket extends DelegateSSLSocket { - - private NoSSLv3SSLSocket(SSLSocket delegate) { - super(delegate); - - } - - @Override - public void setEnabledProtocols(String[] protocols) { - if (protocols != null && protocols.length == 1 && "SSLv3".equals(protocols[0])) { - - List enabledProtocols = new ArrayList<>(Arrays.asList(delegate.getEnabledProtocols())); - if (enabledProtocols.size() > 1) { - if (enabledProtocols.remove("SSLv3")) { - System.out.println("Removed SSLv3 from enabled protocols"); - } - else { - System.out.println("SSLv3 was not an enabled protocol"); - } - } else { - System.out.println("SSL stuck with protocol available for " + String.valueOf(enabledProtocols)); - } - protocols = enabledProtocols.toArray(new String[enabledProtocols.size()]); - } - - super.setEnabledProtocols(protocols); - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/network/cookie/DumbCookie.kt b/app/src/main/java/pl/szczodrzynski/edziennik/network/cookie/DumbCookie.kt new file mode 100644 index 00000000..75b60309 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/network/cookie/DumbCookie.kt @@ -0,0 +1,48 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-3-24. + */ + +package pl.szczodrzynski.edziennik.network.cookie + +import okhttp3.Cookie + +class DumbCookie(var cookie: Cookie) { + + constructor(domain: String, name: String, value: String, expiresAt: Long? = null) : this( + Cookie.Builder() + .name(name) + .value(value) + .also { if (expiresAt != null) it.expiresAt(expiresAt) } + .domain(domain) + .build() + ) + + init { + cookie = Cookie.Builder() + .name(cookie.name()) + .value(cookie.value()) + .expiresAt(cookie.expiresAt()) + .domain(cookie.domain()) + .build() + } + + fun domainMatches(host: String): Boolean { + val domain = cookie.domain() + return host == domain || host.endsWith(".$domain") + } + + override fun equals(other: Any?): Boolean { + if (other !is DumbCookie) return false + if (this.cookie === other.cookie) return true + + return cookie.name() == other.cookie.name() + && cookie.domain() == other.cookie.domain() + } + + override fun hashCode(): Int { + var hash = 17 + hash = 31 * hash + cookie.name().hashCode() + hash = 31 * hash + cookie.domain().hashCode() + return hash + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/network/cookie/DumbCookieJar.kt b/app/src/main/java/pl/szczodrzynski/edziennik/network/cookie/DumbCookieJar.kt new file mode 100644 index 00000000..39cec6eb --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/network/cookie/DumbCookieJar.kt @@ -0,0 +1,103 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-3-24. + */ + +package pl.szczodrzynski.edziennik.network.cookie + +import android.content.Context +import okhttp3.Cookie +import okhttp3.CookieJar +import okhttp3.HttpUrl + +/** + * A simple cookie jar that does not care about the [Cookie.secure], [Cookie.hostOnly], + * [Cookie.httpOnly] and [Cookie.path] attributes. + */ +class DumbCookieJar( + /** + * A context to create the shared prefs file. + */ + context: Context, + + /** + * Whether to persist session cookies as well, when [Cookie.persistent] is false. + */ + private val persistAll: Boolean = false +) : CookieJar { + + private val prefs = context.getSharedPreferences("cookies", Context.MODE_PRIVATE) + val sessionCookies = mutableSetOf() + private val savedCookies = mutableSetOf() + private fun save(dc: DumbCookie) { + sessionCookies.remove(dc) + sessionCookies.add(dc) + if (dc.cookie.persistent() || persistAll) { + savedCookies.remove(dc) + savedCookies.add(dc) + } + } + private fun delete(vararg toRemove: DumbCookie) { + sessionCookies.removeAll(toRemove) + savedCookies.removeAll(toRemove) + } + + override fun saveFromResponse(url: HttpUrl?, cookies: List) { + for (cookie in cookies) { + val dc = DumbCookie(cookie) + save(dc) + } + } + + override fun loadForRequest(url: HttpUrl): List { + return sessionCookies.filter { + it.cookie.matches(url) + }.map { it.cookie } + } + + fun get(domain: String, name: String): String? { + return sessionCookies.firstOrNull { + it.domainMatches(domain) && it.cookie.name() == name + }?.cookie?.value() + } + + fun set(domain: String, name: String, value: String?, isSession: Boolean) = set( + domain, name, value, + if (isSession) null + else System.currentTimeMillis() + 365 * 24 * 60 * 60 * 1000L + ) + + /** + * Add a cookie to the cache. + * By default a session cookie is added. If [expiresAt] is set, the cookie is + * additionally persisted. + */ + fun set(domain: String, name: String?, value: String?, expiresAt: Long? = null) { + name ?: return + if (value == null) { + remove(domain, name) + return + } + val dc = DumbCookie(domain, name, value, expiresAt) + save(dc) + } + + fun getAll(domain: String): Map { + return sessionCookies.filter { + it.domainMatches(domain) + }.map { it.cookie.name() to it.cookie.value() }.toMap() + } + + fun remove(domain: String, name: String) { + val toRemove = sessionCookies.filter { + it.domainMatches(domain) && it.cookie.name() == name + } + delete(*toRemove.toTypedArray()) + } + + fun clear(domain: String) { + val toRemove = sessionCookies.filter { + it.domainMatches(domain) + } + delete(*toRemove.toTypedArray()) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/BootReceiver.java b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/BootReceiver.java deleted file mode 100644 index 018cd0fe..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/BootReceiver.java +++ /dev/null @@ -1,287 +0,0 @@ -package pl.szczodrzynski.edziennik.receivers; - -import android.app.AlarmManager; -import android.app.DownloadManager; -import android.app.IntentService; -import android.app.PendingIntent; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.net.Uri; -import android.os.Build; -import android.widget.Toast; - -import androidx.core.content.FileProvider; - -import java.io.File; -import java.util.List; - -import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.network.ServerRequest; -import pl.szczodrzynski.edziennik.sync.SyncWorker; -import pl.szczodrzynski.edziennik.utils.Utils; - -import static android.content.Context.DOWNLOAD_SERVICE; -import static pl.szczodrzynski.edziennik.App.APP_URL; -import static pl.szczodrzynski.edziennik.App.UPDATES_ON_PLAY_STORE; - -public class BootReceiver extends BroadcastReceiver { - - private static final int NO_INTERNET_RETRY_TIMEOUT = 60; - private static boolean alarmSet = false; - public static long update_download_id; - public static String update_url; - public static String update_filename; - private static final String TAG = "receivers.BootReceiver"; - private App app; - - @Override - public void onReceive(final Context context, final Intent intent) { - app = (App)context.getApplicationContext(); - if (intent.getBooleanExtra("ExecutedByAlarm", false)) - { - alarmSet = false; - } - if (intent.getAction() != null && intent.getAction().equals(DownloadManager.ACTION_DOWNLOAD_COMPLETE)) - { - long referenceId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1); - if(referenceId == update_download_id) { - Intent downloadIntent; - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - if (!app.permissionChecker.canRequestApkInstall()) { - app.permissionChecker.requestApkInstall(); - return; - } - } - File fileLocation = new File(app.getContext().getExternalFilesDir(null), update_filename); - Uri apkUri = FileProvider.getUriForFile(app.getContext(), app.getContext().getApplicationContext().getPackageName() + ".provider", fileLocation); - - downloadIntent = new Intent(Intent.ACTION_VIEW); - downloadIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - downloadIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - downloadIntent.setDataAndType(apkUri, "application/vnd.android.package-archive"); - - List resInfoList = app.getContext().getPackageManager().queryIntentActivities(downloadIntent, PackageManager.MATCH_DEFAULT_ONLY); - for (ResolveInfo resolveInfo : resInfoList) { - String packageName = resolveInfo.activityInfo.packageName; - app.getContext().grantUriPermission(packageName, apkUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION); - } - - } else { - File fileLocation = new File(app.getContext().getExternalFilesDir(null), update_filename); - downloadIntent = new Intent(Intent.ACTION_VIEW); - downloadIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - downloadIntent.setDataAndType(Uri.fromFile(fileLocation), "application/vnd.android.package-archive"); - } - app.getContext().startActivity(downloadIntent); - } - } - else - { - SyncWorker.Companion.scheduleNext(app, false); - if (app.networkUtils.isOnline()) - { - checkUpdate(context, intent); - } - else - { - //Toast.makeText(context, "No internet, retrying in "+NO_INTERNET_RETRY_TIMEOUT+" seconds", Toast.LENGTH_SHORT).show(); - scheduleUpdateCheck(context, NO_INTERNET_RETRY_TIMEOUT); - } - } - } - - private boolean scheduleUpdateCheck(Context context, int secondsLater) - { - Intent alarmIntent = new Intent(context, BootReceiver.class); - alarmIntent.putExtra("ExecutedByAlarm", true); - PendingIntent alarmPendingIntent = PendingIntent.getBroadcast(context, 234324243, alarmIntent, 0); - AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); - if (alarmManager != null) { - alarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + (secondsLater * 1000), alarmPendingIntent); - return true; - } - return false; - } - - private void checkUpdate(final Context context, final Intent intent) - { - if (!alarmSet) { - //Toast.makeText(context, "Update scheduled for 48 hours since now", Toast.LENGTH_SHORT).show(); - alarmSet = scheduleUpdateCheck(context, 48 * 60 * 60); - } - - //app.networkUtils.setSelfSignedSSL(app.getContext(), null); - - new ServerRequest(app, app.requestScheme + APP_URL + "main.php?get_update", "BootReceiver/UPD") - .run(((e, result) -> { - if (result != null) { - if (result.get("update_available").getAsBoolean()) { - String updateVersion = result.get("update_version").getAsString(); - String updateUrl = result.get("update_url").getAsString(); - String updateFilename = result.get("update_filename").getAsString(); - boolean updateMandatory = result.get("update_mandatory").getAsBoolean(); - boolean updateDirect = result.get("update_direct").getAsBoolean(); - - if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals(updateVersion)) { - app.appConfig.updateVersion = updateVersion; - app.appConfig.updateUrl = updateUrl; - app.appConfig.updateFilename = updateFilename; - app.appConfig.updateMandatory = updateMandatory; - app.appConfig.updateDirect = updateDirect; - app.saveConfig(); - } - if (!UPDATES_ON_PLAY_STORE || intent.getBooleanExtra("UserChecked", false)) { - app.notifier.notificationUpdatesShow( - updateVersion, - updateUrl, - updateFilename, - updateDirect); - } - } else { - if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals("")) { - app.appConfig.updateVersion = ""; - app.appConfig.updateMandatory = false; - app.saveConfig(); - } - app.notifier.notificationUpdatesHide(); - - if (intent.getBooleanExtra("UserChecked", false)) { - Toast.makeText(context, context.getString(R.string.notification_no_update), Toast.LENGTH_LONG).show(); - } - } - } - else - { - //Toast.makeText(context, "Server returned nothing, retrying in "+NO_INTERNET_RETRY_TIMEOUT+" seconds", Toast.LENGTH_SHORT).show(); - scheduleUpdateCheck(context, NO_INTERNET_RETRY_TIMEOUT); - } - })); - /*Ion.with(app.getContext()) - .load(app.requestScheme + APP_URL + "main.php?get_update") - .setBodyParameter("username", (app.profile.autoRegistrationAllowed ? app.profile.registrationUsername : app.appConfig.deviceId)) - .setBodyParameter("app_version_build_type", BuildConfig.BUILD_TYPE) - .setBodyParameter("app_version_code", Integer.toString(BuildConfig.VERSION_CODE)) - .setBodyParameter("app_version", BuildConfig.VERSION_NAME + " " + BuildConfig.BUILD_TYPE + " (" + BuildConfig.VERSION_CODE + ")") - .setBodyParameter("device_id", Settings.Secure.getString(app.getContext().getContentResolver(), Settings.Secure.ANDROID_ID)) - .setBodyParameter("device_model", Build.MANUFACTURER+" "+Build.MODEL) - .setBodyParameter("device_os_version", Build.VERSION.RELEASE) - .setBodyParameter("fcm_token", app.appConfig.fcmToken) - .asJsonObject() - .setCallback((e, result) -> { - // do stuff with the result or error - if (result != null) { - if (result.get("update_available").getAsBoolean()) { - String updateVersion = result.get("update_version").getAsString(); - String updateUrl = result.get("update_url").getAsString(); - String updateFilename = result.get("update_filename").getAsString(); - - if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals(updateVersion)) { - app.appConfig.updateVersion = updateVersion; - app.appConfig.updateUrl = updateUrl; - app.appConfig.updateFilename = updateFilename; - app.saveConfig(); - } - app.notifier.notificationUpdatesShow( - updateVersion, - updateUrl, - updateFilename); - } else { - if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals("")) { - app.appConfig.updateVersion = ""; - app.saveConfig(); - } - app.notifier.notificationUpdatesHide(); - - if (intent.getBooleanExtra("UserChecked", false)) { - Toast.makeText(context, context.getString(R.string.notification_no_update), Toast.LENGTH_LONG).show(); - } - } - } - else - { - //Toast.makeText(context, "Server returned nothing, retrying in "+NO_INTERNET_RETRY_TIMEOUT+" seconds", Toast.LENGTH_SHORT).show(); - scheduleUpdateCheck(context, NO_INTERNET_RETRY_TIMEOUT); - } - });*/ - } - - private static DownloadManager downloadManager; - - public static long downloadFile(Context context) { - Toast.makeText(context, R.string.downloading, Toast.LENGTH_SHORT).show(); - File dir = new File(context.getExternalFilesDir(null)+""/*, update_filename*/); - /*if (existingFile.exists()) - { - existingFile.delete(); - }*/ - if (dir.isDirectory()) - { - String[] children = dir.list(); - for (int i = 0; i < children.length; i++) - { - new File(dir, children[i]).delete(); - } - } - - Uri uri = Uri.parse(update_url); - long downloadReference; - // Create request for android download manager - downloadManager = (DownloadManager)context.getSystemService(DOWNLOAD_SERVICE); - DownloadManager.Request request = new DownloadManager.Request(uri); - //Setting title of request - request.setTitle(context.getString(R.string.app_name)); - //Setting description of request - request.setDescription(context.getString(R.string.notification_downloading_update)); - //Set the local destination for the downloaded file to a path within the application's external files directory - try { - request.setDestinationInExternalFilesDir(context, null, update_filename); - } - catch (java.lang.IllegalStateException e) - { - e.printStackTrace(); - Toast.makeText(context, "Failed to get external storage files directory", Toast.LENGTH_SHORT).show(); - } - //Enqueue download and save into referenceId - downloadReference = downloadManager.enqueue(request); - return downloadReference; - } - - public static class NotificationActionService extends IntentService { - private static final String TAG = "BootReceiver/NAS"; - - public NotificationActionService() { - super(NotificationActionService.class.getSimpleName()); - //IntentFilter filter = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE); - //registerReceiver(downloadReceiver, filter); - } - - @Override - protected void onHandleIntent(Intent intent) { - if (UPDATES_ON_PLAY_STORE && !intent.getBooleanExtra("update_direct", false)) { - Utils.openGooglePlay(this, "pl.szczodrzynski.edziennik"); - return; - } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - App app = (App)getApplication(); - if (!app.permissionChecker.canRequestApkInstall()) { - app.permissionChecker.requestApkInstall(); - app.notifier.notificationUpdatesShow( - intent.getStringExtra("update_version"), - intent.getStringExtra("update_url"), - intent.getStringExtra("update_filename"), - intent.getBooleanExtra("update_direct", false)); - return; - } - } - update_url = intent.getStringExtra("update_url"); - update_filename = intent.getStringExtra("update_filename"); - //update_filename = "Edziennik_update.apk"; - update_download_id = downloadFile(this); - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt index 2b5f38c9..f7819c43 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/SzkolnyReceiver.kt @@ -7,12 +7,22 @@ package pl.szczodrzynski.edziennik.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.os.Bundle import pl.szczodrzynski.edziennik.data.api.ApiService +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask import pl.szczodrzynski.edziennik.data.api.events.requests.ServiceCloseRequest import pl.szczodrzynski.edziennik.data.api.events.requests.TaskCancelRequest -import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask class SzkolnyReceiver : BroadcastReceiver() { + companion object { + const val ACTION = "pl.szczodrzynski.edziennik.SZKOLNY_MAIN" + fun getIntent(context: Context, extras: Bundle): Intent { + val intent = Intent(context, SzkolnyReceiver::class.java) + intent.putExtras(extras) + return intent + } + } + override fun onReceive(context: Context?, intent: Intent?) { context ?: return when (intent?.extras?.getString("task", null)) { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/UserPresentReceiver.java b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/UserPresentReceiver.java index 3884c4f0..82a31f11 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/receivers/UserPresentReceiver.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/receivers/UserPresentReceiver.java @@ -6,7 +6,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; -import pl.szczodrzynski.edziennik.WidgetTimetable; +import pl.szczodrzynski.edziennik.ui.widgets.timetable.WidgetTimetableProvider; public class UserPresentReceiver extends BroadcastReceiver { @Override @@ -14,12 +14,12 @@ public class UserPresentReceiver extends BroadcastReceiver { if (intent.getAction() != null) { if (intent.getAction().equals(Intent.ACTION_USER_PRESENT)) { //Toast.makeText(context, "User is present", Toast.LENGTH_SHORT).show(); - Intent widgetIntent = new Intent(context, WidgetTimetable.class); + Intent widgetIntent = new Intent(context, WidgetTimetableProvider.class); widgetIntent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE); // Use an array and EXTRA_APPWIDGET_IDS instead of AppWidgetManager.EXTRA_APPWIDGET_ID, // since it seems the onUpdate() is only fired on that: int[] ids = AppWidgetManager.getInstance(context) - .getAppWidgetIds(new ComponentName(context, WidgetTimetable.class)); + .getAppWidgetIds(new ComponentName(context, WidgetTimetableProvider.class)); widgetIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids); context.sendBroadcast(widgetIntent); } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/FirebaseBroadcastReceiver.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/FirebaseBroadcastReceiver.kt deleted file mode 100644 index cc437ad6..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/sync/FirebaseBroadcastReceiver.kt +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) Kuba Szczodrzyński 2019-10-11. - */ - -package pl.szczodrzynski.edziennik.sync - -import android.content.Context -import android.content.Intent -import android.util.Log -import androidx.legacy.content.WakefulBroadcastReceiver -import com.google.firebase.messaging.RemoteMessage -import com.google.gson.JsonObject -import pl.szczodrzynski.edziennik.App - -class FirebaseBroadcastReceiver : WakefulBroadcastReceiver() { - - val TAG: String = FirebaseBroadcastReceiver::class.java.simpleName - - override fun onReceive(context: Context, intent: Intent) { - - val json = JsonObject() - - val dataBundle = intent.extras - if (dataBundle != null) - for (key in dataBundle.keySet()) { - dataBundle.get(key)?.let { - when (it) { - is String -> json.addProperty(key, it) - is Int -> json.addProperty(key, it) - is Long -> json.addProperty(key, it) - is Float -> json.addProperty(key, it) - is Boolean -> json.addProperty(key, it) - else -> json.addProperty(key, it.toString()) - } - } - } - - Log.d(TAG, "Firebase got push from Librus Broadcast ${json}") - - val sharedPreferences = context.getSharedPreferences("pushtest_broadcast", Context.MODE_PRIVATE) - sharedPreferences.edit().putString( - System.currentTimeMillis().toString(), - json.toString() - ).apply() - } -} \ No newline at end of file diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java b/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java deleted file mode 100644 index 546f760e..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/sync/MyFirebaseMessagingService.java +++ /dev/null @@ -1,328 +0,0 @@ -package pl.szczodrzynski.edziennik.sync; - -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.os.AsyncTask; -import android.util.Log; - -import com.google.firebase.messaging.FirebaseMessagingService; -import com.google.firebase.messaging.RemoteMessage; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; - -import java.util.List; - -import pl.szczodrzynski.edziennik.App; -import pl.szczodrzynski.edziennik.BuildConfig; -import pl.szczodrzynski.edziennik.MainActivity; -import pl.szczodrzynski.edziennik.R; -import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask; -import pl.szczodrzynski.edziennik.data.db.modules.events.Event; -import pl.szczodrzynski.edziennik.data.db.modules.events.EventFull; -import pl.szczodrzynski.edziennik.data.db.modules.events.EventType; -import pl.szczodrzynski.edziennik.data.db.modules.feedback.FeedbackMessage; -import pl.szczodrzynski.edziennik.data.db.modules.profiles.ProfileFull; -import pl.szczodrzynski.edziennik.data.db.modules.teams.Team; -import pl.szczodrzynski.edziennik.network.ServerRequest; -import pl.szczodrzynski.edziennik.ui.modules.base.DebugFragment; -import pl.szczodrzynski.edziennik.utils.models.Notification; - -import static pl.szczodrzynski.edziennik.App.APP_URL; -import static pl.szczodrzynski.edziennik.data.db.modules.events.Event.TYPE_HOMEWORK; -import static pl.szczodrzynski.edziennik.data.db.modules.login.LoginStore.LOGIN_TYPE_MOBIDZIENNIK; -import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_FEEDBACK_MESSAGE; -import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_SHARED_EVENT; -import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_NEW_SHARED_HOMEWORK; -import static pl.szczodrzynski.edziennik.data.db.modules.notification.Notification.TYPE_SERVER_MESSAGE; -import static pl.szczodrzynski.edziennik.utils.Utils.d; -import static pl.szczodrzynski.edziennik.utils.Utils.strToInt; - -public class MyFirebaseMessagingService extends FirebaseMessagingService { - private static final String TAG = "FirebaseMessaging"; - - @Override - public void onNewToken(String s) { - super.onNewToken(s); - - Log.d(TAG, "New token: "+s); - App app = (App)getApplicationContext(); - if (app.config.getSync().getTokenApp() == null || !app.config.getSync().getTokenApp().equals(s)) { - app.config.getSync().setTokenApp(s); - } - } - - @Override - public void onMessageReceived(RemoteMessage remoteMessage) { - App app = ((App) getApplicationContext()); - // Not getting messages here? See why this may be: https://goo.gl/39bRNJ - - String from = remoteMessage.getFrom(); - if (from != null) { - switch (from) { - case "640759989760": - app.debugLog("Firebase got push from App "+remoteMessage.getData().toString()); - //processAppPush - processAppPush(app, remoteMessage); - break; - case "747285019373": - app.debugLog("Firebase got push from Mobidziennik "+remoteMessage.getData().toString()); - processMobidziennikPush(app, remoteMessage); - break; - case "513056078587": - app.debugLog("Firebase got push from Librus "+remoteMessage.getData().toString()); - processLibrusPush(app, remoteMessage); - break; - case "987828170337": - app.debugLog("Firebase got push from Vulcan "+remoteMessage.getData().toString()); - processVulcanPush(app, remoteMessage); - break; - } - } - } - - private void processMobidziennikPush(App app, RemoteMessage remoteMessage) { - SharedPreferences sharedPreferences = getSharedPreferences("pushtest_mobidziennik", Context.MODE_PRIVATE); - sharedPreferences.edit().putString(Long.toString(System.currentTimeMillis()), remoteMessage.getData().toString()+"\n"+remoteMessage.toString()+"\n"+remoteMessage.getMessageType()).apply(); - String studentIdStr = remoteMessage.getData().get("id_ucznia"); - if (studentIdStr != null) { - int studentId = strToInt(studentIdStr); - AsyncTask.execute(() -> { - List profileList = app.db.profileDao().getAllFullNow(); - - ProfileFull profile = null; - - for (ProfileFull profileFull: profileList) { - if (profileFull.getLoginStoreType() == LOGIN_TYPE_MOBIDZIENNIK - && studentId == profileFull.getStudentData("studentId", -1)) { - profile = profileFull; - break; - } - } - - if (profile != null) { - if (remoteMessage.getData().get("id_wiadomosci") != null) { - /*app.notifier.add(new Notification(app.getContext(), remoteMessage.getData().get("message")) - .withProfileData(profile.id, profile.name) - .withTitle(remoteMessage.getData().get("title")) - .withType(Notification.TYPE_NEW_MESSAGE) - .withFragmentRedirect(MainActivity.DRAWER_ITEM_MESSAGES) - ); - app.notifier.postAll(profile); - app.saveConfig("notifications");*/ - d(TAG, "Syncing profile " + profile.getId()); - EdziennikTask.Companion.syncProfile(profile.getId(), null, null).enqueue(app); - } else { - /*app.notifier.add(new Notification(app.getContext(), remoteMessage.getData().get("message")) - .withProfileData(profile.id, profile.name) - .withTitle(remoteMessage.getData().get("title")) - .withType(Notification.TYPE_SERVER_MESSAGE) - .withFragmentRedirect(MainActivity.DRAWER_ITEM_HOME) - ); - app.notifier.postAll(profile); - app.saveConfig("notifications");*/ - d(TAG, "Syncing profile " + profile.getId()); - EdziennikTask.Companion.syncProfile(profile.getId(), null, null).enqueue(app); - } - } - }); - } - } - - private void processLibrusPush(App app, RemoteMessage remoteMessage) { - SharedPreferences sharedPreferences = getSharedPreferences("pushtest_librus", Context.MODE_PRIVATE); - sharedPreferences.edit().putString(Long.toString(System.currentTimeMillis()), remoteMessage.getData().toString()+"\n"+remoteMessage.toString()+"\n"+remoteMessage.getMessageType()).apply(); - } - - private void processVulcanPush(App app, RemoteMessage remoteMessage) { - SharedPreferences sharedPreferences = getSharedPreferences("pushtest_vulcan", Context.MODE_PRIVATE); - sharedPreferences.edit().putString(Long.toString(System.currentTimeMillis()), remoteMessage.getData().toString()+"\n"+remoteMessage.toString()+"\n"+remoteMessage.getMessageType()).apply(); - } - - private void processAppPush(App app, RemoteMessage remoteMessage) { - // Check if message contains a data payload. - String type = remoteMessage.getData().get("type"); - if (remoteMessage.getData().size() > 0 - && type != null) { - //Log.d(TAG, "Message data payload: " + remoteMessage.sync()); - switch (type) { - case "app_update": - int versionCode = Integer.parseInt(remoteMessage.getData().get("update_version_code")); - if (BuildConfig.VERSION_CODE < versionCode) { - String updateVersion = remoteMessage.getData().get("update_version"); - String updateUrl = remoteMessage.getData().get("update_url"); - String updateFilename = remoteMessage.getData().get("update_filename"); - boolean updateMandatory = Boolean.parseBoolean(remoteMessage.getData().get("update_mandatory")); - boolean updateDirect = Boolean.parseBoolean(remoteMessage.getData().get("update_direct")); - - if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals(updateVersion)) { - app.appConfig.updateVersion = updateVersion; - app.appConfig.updateUrl = updateUrl; - app.appConfig.updateFilename = updateFilename; - app.appConfig.updateMandatory = updateMandatory; - app.appConfig.updateDirect = updateDirect; - app.saveConfig("updateVersion", "updateUrl", "updateFilename", "updateMandatory"); - } - if (!remoteMessage.getData().containsKey("update_silent")) { - app.notifier.notificationUpdatesShow( - updateVersion, - updateUrl, - updateFilename, - updateDirect); - } - } else { - if (app.appConfig.updateVersion == null || !app.appConfig.updateVersion.equals("")) { - app.appConfig.updateVersion = ""; - app.appConfig.updateMandatory = false; - app.saveConfig("updateVersion", "updateMandatory"); - } - app.notifier.notificationUpdatesHide(); - } - break; - case "message": - app.notifier.add(new Notification(app.getContext(), remoteMessage.getData().get("message")) - .withTitle(remoteMessage.getData().get("title")) - .withType(TYPE_SERVER_MESSAGE) - .withFragmentRedirect(MainActivity.DRAWER_ITEM_NOTIFICATIONS) - ); - app.notifier.postAll(null); - app.saveConfig("notifications"); - break; - case "feedback_message_from_dev": - AsyncTask.execute(() -> { - FeedbackMessage feedbackMessage = new FeedbackMessage(true, remoteMessage.getData().get("message")); - if (feedbackMessage.text.startsWith("test")) { - // todo - } - else { - feedbackMessage.sentTime = Long.parseLong(remoteMessage.getData().get("sent_time")); - if (feedbackMessage.text.startsWith("devmode")) { - app.config.setDevModePassword(feedbackMessage.text.replace("devmode", "")); - app.checkDevModePassword(); - feedbackMessage.text = "devmode "+(App.devMode ? "allowed" : "disallowed"); - } - Intent intent = new Intent("pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity"); - intent.putExtra("type", "user_chat"); - intent.putExtra("message", app.gson.toJson(feedbackMessage)); - app.sendBroadcast(intent); - app.db.feedbackMessageDao().add(feedbackMessage); - - app.notifier.add(new Notification(app.getContext(), feedbackMessage.text) - .withTitle(remoteMessage.getData().get("title")) - .withType(TYPE_FEEDBACK_MESSAGE) - .withFragmentRedirect(MainActivity.TARGET_FEEDBACK) - ); - app.notifier.postAll(null); - app.saveConfig("notifications"); - } - }); - break; - case "feedback_message_from_user": - AsyncTask.execute(() -> { - FeedbackMessage feedbackMessage = new FeedbackMessage(true, remoteMessage.getData().get("message")); - feedbackMessage.fromUser = remoteMessage.getData().get("from_user"); - feedbackMessage.fromUserName = remoteMessage.getData().get("from_user_name"); - feedbackMessage.sentTime = Long.parseLong(remoteMessage.getData().get("sent_time")); - Intent intent = new Intent("pl.szczodrzynski.edziennik.ui.modules.base.FeedbackActivity"); - intent.putExtra("type", "user_chat"); - intent.putExtra("message", app.gson.toJson(feedbackMessage)); - app.sendBroadcast(intent); - app.db.feedbackMessageDao().add(feedbackMessage); - }); - app.notifier.add(new Notification(app.getContext(), remoteMessage.getData().get("message")) - .withTitle(remoteMessage.getData().get("title")) - .withType(TYPE_FEEDBACK_MESSAGE) - .withFragmentRedirect(MainActivity.TARGET_FEEDBACK) - ); - app.notifier.postAll(null); - app.saveConfig("notifications"); - break; - case "ping": - // just a ping - break; - /* ______ _ _ - | ____| | | | | - | |____ _____ _ __ | |_ ______ ___| |__ __ _ _ __ ___ - | __\ \ / / _ \ '_ \| __| |______| / __| '_ \ / _` | '__/ _ \ - | |___\ V / __/ | | | |_ \__ \ | | | (_| | | | __/ - |______\_/ \___|_| |_|\__| |___/_| |_|\__,_|_| \__*/ - case "event": - case "event_removed": - AsyncTask.execute(() -> { - String teamCode = remoteMessage.getData().get("team"); - String teamUnshareCode = remoteMessage.getData().get("team_unshare"); - while (teamCode != null || teamUnshareCode != null) { - d(TAG, "Got an event for teamCode " + teamCode + " and teamUnshareCode " + teamUnshareCode); - // get the target Profile by the corresponding teamCode - List profiles = app.db.profileDao().getByTeamCodeNowWithRegistration(teamCode == null ? teamUnshareCode : teamCode); - for (ProfileFull profile : profiles) { - d(TAG, "Matched profile " + profile.getName()); - if (teamCode != null) { - // SHARING - JsonObject jEvent = new JsonParser().parse(remoteMessage.getData().get("data")).getAsJsonObject(); - d(TAG, "An event is there! " + jEvent.toString()); - // get the target Team from teamCode - Team team = app.db.teamDao().getByCodeNow(profile.getId(), teamCode); - if (team != null) { - d(TAG, "The target team is " + team.name + ", ID " + team.id); - // create the event from Json. Add the missing teamId and !!profileId!! - Event event = app.gson.fromJson(jEvent.toString(), Event.class); - if (jEvent.get("colorDefault") != null) { - event.color = -1; - } - event.profileId = profile.getId(); - event.teamId = team.id; - d(TAG, "Created the event! " + event); - - // TODO? i guess - Event oldEvent = app.db.eventDao().getByIdNow(profile.getId(), event.id); - if (event.sharedBy != null && event.sharedBy.equals(profile.getUsernameId())) { - d(TAG, "Shared by self! Changing name"); - event.sharedBy = "self"; - event.sharedByName = profile.getStudentNameLong(); - } - d(TAG, "Old event found? " + oldEvent); - EventType eventType = app.db.eventTypeDao().getByIdNow(profile.getId(), event.type); - app.notifier.add(new Notification(app.getContext(), app.getString((oldEvent == null ? R.string.notification_shared_event_format : R.string.notification_shared_event_modified_format), event.sharedByName, eventType == null ? "wydarzenie" : eventType.name, event.eventDate.getFormattedString(), event.topic)) - .withProfileData(profile.getId(), profile.getName()) - .withType(event.type == TYPE_HOMEWORK ? TYPE_NEW_SHARED_HOMEWORK : TYPE_NEW_SHARED_EVENT) - .withFragmentRedirect(event.type == TYPE_HOMEWORK ? MainActivity.DRAWER_ITEM_HOMEWORK : MainActivity.DRAWER_ITEM_AGENDA) - .withLongExtra("eventDate", event.eventDate.getValue()) - ); - d(TAG, "Finishing adding event " + event); - app.db.eventDao().add(event); - try { - app.db.metadataDao().setBoth(profile.getId(), event, false, true, jEvent.get("addedDate").getAsLong()); - } catch (Exception e) { - e.printStackTrace(); - } - } - } else { - // UNSHARING - long eventId = Long.parseLong(remoteMessage.getData().get("remove_id")); - EventFull oldEvent = app.db.eventDao().getByIdNow(profile.getId(), eventId); - if (oldEvent != null) { - app.notifier.add(new Notification(app.getContext(), app.getString(R.string.notification_shared_event_removed_format, oldEvent.sharedByName, oldEvent.typeName, oldEvent.eventDate.getFormattedString(), oldEvent.topic)) - .withProfileData(profile.getId(), profile.getName()) - .withType(oldEvent.type == TYPE_HOMEWORK ? TYPE_NEW_SHARED_HOMEWORK : TYPE_NEW_SHARED_EVENT) - .withFragmentRedirect(oldEvent.type == TYPE_HOMEWORK ? MainActivity.DRAWER_ITEM_HOMEWORK : MainActivity.DRAWER_ITEM_AGENDA) - .withLongExtra("eventDate", oldEvent.eventDate.getValue()) - ); - app.db.eventDao().remove(oldEvent); - } - } - } - if (teamCode != null) { - teamCode = null; - } else { - teamUnshareCode = null; - } - } - app.notifier.postAll(null); - app.saveConfig(); - }); - break; - } - } - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt index 65e46ce1..05a03fbc 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/SyncWorker.kt @@ -2,13 +2,9 @@ package pl.szczodrzynski.edziennik.sync import android.annotation.SuppressLint import android.content.Context -import android.os.AsyncTask import androidx.work.* -import androidx.work.impl.WorkManagerImpl -import org.greenrobot.eventbus.EventBus import pl.szczodrzynski.edziennik.App -import pl.szczodrzynski.edziennik.MINUTE -import pl.szczodrzynski.edziennik.data.api.task.EdziennikTask +import pl.szczodrzynski.edziennik.data.api.edziennik.EdziennikTask import pl.szczodrzynski.edziennik.formatDate import pl.szczodrzynski.edziennik.utils.Utils.d import java.util.concurrent.TimeUnit @@ -22,35 +18,8 @@ class SyncWorker(val context: Context, val params: WorkerParameters) : Worker(co */ @SuppressLint("RestrictedApi") fun scheduleNext(app: App, rescheduleIfFailedFound: Boolean = true) { - AsyncTask.execute { - val workManager = WorkManager.getInstance(app) as WorkManagerImpl - val scheduledWork = workManager.workDatabase.workSpecDao().scheduledWork - scheduledWork.forEach { - d(TAG, "Work: ${it.id} at ${(it.periodStartTime+it.initialDelay).formatDate()}. State = ${it.state} (finished = ${it.state.isFinished})") - } - // remove finished work and other than SyncWorker - scheduledWork.removeAll { it.workerClassName != SyncWorker::class.java.canonicalName || it.isPeriodic || it.state.isFinished } - d(TAG, "Found ${scheduledWork.size} unfinished work") - // remove all enqueued work that had to (but didn't) run at some point in the past (at least 1min ago) - val failedWork = scheduledWork.filter { it.state == WorkInfo.State.ENQUEUED && it.periodStartTime+it.initialDelay < System.currentTimeMillis() - 1*MINUTE*1000 } - d(TAG, "${failedWork.size} work requests failed to start (out of ${scheduledWork.size} requests)") - if (rescheduleIfFailedFound) { - if (failedWork.isNotEmpty()) { - d(TAG, "App Manager detected!") - EventBus.getDefault().postSticky(AppManagerDetectedEvent(failedWork.map { it.periodStartTime + it.initialDelay })) - } - if (scheduledWork.size - failedWork.size < 1) { - d(TAG, "No pending work found, scheduling next:") - rescheduleNext(app) - } - } - else { - d(TAG, "NOT rescheduling: waiting to open the activity") - if (scheduledWork.size < 1) { - d(TAG, "No work found *at all*, scheduling next:") - rescheduleNext(app) - } - } + WorkerUtils.scheduleNext(app, rescheduleIfFailedFound) { + rescheduleNext(app) } } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateDownloaderService.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateDownloaderService.kt new file mode 100644 index 00000000..31c24d2f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateDownloaderService.kt @@ -0,0 +1,120 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-18. + */ + +package pl.szczodrzynski.edziennik.sync + +import android.app.DownloadManager +import android.app.IntentService +import android.app.NotificationManager +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.pm.PackageManager +import android.net.Uri +import android.os.Build +import android.widget.Toast +import androidx.core.content.FileProvider +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update +import pl.szczodrzynski.edziennik.utils.Utils +import java.io.File + +class UpdateDownloaderService : IntentService(UpdateDownloaderService::class.java.simpleName) { + companion object { + private const val TAG = "UpdateDownloaderService" + private var downloadId = 0L + private var downloadFilename = "" + } + + private fun tryUpdateWithGooglePlay(update: Update): Boolean { + if (!update.isOnGooglePlay) + return false + return try { + Utils.openGooglePlay(this, application.packageName) + true + } + catch (e: Exception) { + e.printStackTrace() + false + } + } + + class DownloadProgressReceiver : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent?) { + if (intent?.action != DownloadManager.ACTION_DOWNLOAD_COMPLETE) + return + if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) != downloadId) + return + val app = context.applicationContext as App + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !app.permissionChecker.canRequestApkInstall()) { + app.permissionChecker.requestApkInstall() + return + } + + val file = File(app.getExternalFilesDir(null), downloadFilename) + val installIntent = Intent(Intent.ACTION_VIEW) + installIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) + installIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + installIntent.setDataAndType(Uri.fromFile(file), "application/vnd.android.package-archive") + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + val apkUri = FileProvider.getUriForFile(app, "${app.packageName}.provider", file) + installIntent.setDataAndType(apkUri, "application/vnd.android.package-archive") + + val resInfoList = app.packageManager.queryIntentActivities(installIntent, PackageManager.MATCH_DEFAULT_ONLY) + for (resolveInfo in resInfoList) { + val packageName = resolveInfo.activityInfo.packageName + app.grantUriPermission(packageName, apkUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION) + } + } + + app.startActivity(installIntent) + } + } + + override fun onHandleIntent(intent: Intent?) { + val app = application as App + val update = App.config.update ?: return + + if (tryUpdateWithGooglePlay(update)) + return + + if (update.downloadUrl == null) { + Toast.makeText(app, "Nie można pobrać tej aktualizacji. Pobierz ręcznie z Google Play.", Toast.LENGTH_LONG).show() + return + } + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !app.permissionChecker.canRequestApkInstall()) { + app.permissionChecker.requestApkInstall() + return + } + + (app.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(app.notificationChannelsManager.updates.id) + + val dir: File? = app.getExternalFilesDir(null) + if (dir?.isDirectory == true) { + dir.listFiles()?.forEach { + it.delete() + } + } + + val uri = Uri.parse(update.downloadUrl) + downloadFilename = "${update.versionName}.apk" + + val downloadManager = app.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager + val request = DownloadManager.Request(uri) + request.setTitle(app.getString(R.string.app_name)+" "+update.versionName) + request.setDescription(app.getString(R.string.notification_downloading_update)) + try { + request.setDestinationInExternalFilesDir(app, null, downloadFilename) + } catch (e: IllegalStateException) { + e.printStackTrace() + Toast.makeText(app, "Nie można znaleźć katalogu docelowego. Pobierz aktualizację ręcznie z Google Play.", Toast.LENGTH_LONG).show() + return + } + downloadId = downloadManager.enqueue(request) + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt new file mode 100644 index 00000000..80e21e6b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/UpdateWorker.kt @@ -0,0 +1,163 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-18. + */ + +package pl.szczodrzynski.edziennik.sync + +import android.annotation.SuppressLint +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.Context +import android.content.Intent +import android.text.Html +import android.widget.Toast +import androidx.core.app.NotificationCompat +import androidx.work.* +import kotlinx.coroutines.* +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.api.szkolny.SzkolnyApi +import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update +import pl.szczodrzynski.edziennik.utils.Utils +import java.util.concurrent.TimeUnit +import kotlin.coroutines.CoroutineContext + +class UpdateWorker(val context: Context, val params: WorkerParameters) : Worker(context, params), CoroutineScope { + companion object { + const val TAG = "UpdateWorker" + + /** + * Schedule the sync job only if it's not already scheduled. + */ + @SuppressLint("RestrictedApi") + fun scheduleNext(app: App, rescheduleIfFailedFound: Boolean = true) { + WorkerUtils.scheduleNext(app, rescheduleIfFailedFound) { + rescheduleNext(app) + } + } + + /** + * Cancel any existing sync jobs and schedule a new one. + * + * If [ConfigSync.enabled] is not true, just cancel every job. + */ + fun rescheduleNext(app: App) { + cancelNext(app) + if (!app.config.sync.notifyAboutUpdates) { + return + } + val syncInterval = 4 * DAY; + + val syncAt = System.currentTimeMillis() + syncInterval*1000 + Utils.d(TAG, "Scheduling work at ${syncAt.formatDate()}") + + val constraints = Constraints.Builder() + .setRequiredNetworkType(NetworkType.CONNECTED) + .build() + + val syncWorkRequest = OneTimeWorkRequestBuilder() + .setInitialDelay(syncInterval, TimeUnit.SECONDS) + .setConstraints(constraints) + .addTag(TAG) + .build() + + WorkManager.getInstance(app).enqueue(syncWorkRequest) + } + + /** + * Cancel any scheduled sync job. + */ + fun cancelNext(app: App) { + Utils.d(TAG, "Cancelling work by tag $TAG") + WorkManager.getInstance(app).cancelAllWorkByTag(TAG) + } + + suspend fun runNow(app: App, overrideUpdate: Update? = null) { + try { + val update = overrideUpdate + ?: run { + withContext(Dispatchers.Default) { + SzkolnyApi(app).runCatching({ + getUpdate("beta") + }, { + Toast.makeText(app, app.getString(R.string.notification_cant_check_update), Toast.LENGTH_SHORT).show() + }) + } ?: return@run null + + if (app.config.update == null + || app.config.update?.versionCode ?: BuildConfig.VERSION_CODE <= BuildConfig.VERSION_CODE) { + app.config.update = null + Toast.makeText(app, app.getString(R.string.notification_no_update), Toast.LENGTH_SHORT).show() + return@run null + } + app.config.update + } ?: return + + if (update.versionCode <= BuildConfig.VERSION_CODE) { + app.config.update = null + return + } + + if (EventBus.getDefault().hasSubscriberForEvent(update::class.java)) { + if (!update.updateMandatory) // mandatory updates are posted by the SzkolnyApi + EventBus.getDefault().postSticky(update) + return + } + + val notificationIntent = Intent(app, UpdateDownloaderService::class.java) + val pendingIntent = PendingIntent.getService(app, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT) + val notification = NotificationCompat.Builder(app, app.notificationChannelsManager.updates.key) + .setContentTitle(app.getString(R.string.notification_updates_title)) + .setContentText(app.getString(R.string.notification_updates_text, update.versionName)) + .setTicker(app.getString(R.string.notification_updates_summary)) + .setSmallIcon(R.drawable.ic_notification) + .setStyle(NotificationCompat.BigTextStyle() + .bigText(listOf( + app.getString(R.string.notification_updates_text, update.versionName), + update.releaseNotes?.let { Html.fromHtml(it) } + ).concat("\n"))) + .setColor(0xff2196f3.toInt()) + .setLights(0xFF00FFFF.toInt(), 2000, 2000) + .setPriority(NotificationCompat.PRIORITY_HIGH) + .setDefaults(NotificationCompat.DEFAULT_ALL) + .setGroup(app.notificationChannelsManager.updates.key) + .setContentIntent(pendingIntent) + .setAutoCancel(false) + .build() + (app.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).notify(app.notificationChannelsManager.updates.id, notification) + + } catch (ignore: Exception) { } + } + } + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + override fun doWork(): Result { + Utils.d(TAG, "Running worker ID ${params.id}") + val app = context as App + if (!app.config.sync.notifyAboutUpdates) { + return Result.success() + } + + launch { + runNow(app) + } + + rescheduleNext(this.context) + return Result.success() + } + + class JavaWrapper(app: App) : CoroutineScope { + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + init { + launch { + runNow(app) + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/sync/WorkerUtils.kt b/app/src/main/java/pl/szczodrzynski/edziennik/sync/WorkerUtils.kt new file mode 100644 index 00000000..0eaa65eb --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/sync/WorkerUtils.kt @@ -0,0 +1,54 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-18. + */ + +package pl.szczodrzynski.edziennik.sync + +import android.annotation.SuppressLint +import android.os.AsyncTask +import androidx.work.WorkInfo +import androidx.work.WorkManager +import androidx.work.impl.WorkManagerImpl +import org.greenrobot.eventbus.EventBus +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MINUTE +import pl.szczodrzynski.edziennik.formatDate +import pl.szczodrzynski.edziennik.utils.Utils + +object WorkerUtils { + /** + * Schedule the sync job only if it's not already scheduled. + */ + @SuppressLint("RestrictedApi") + inline fun scheduleNext(app: App, rescheduleIfFailedFound: Boolean = true, crossinline onReschedule: () -> Unit) { + AsyncTask.execute { + val workManager = WorkManager.getInstance(app) as WorkManagerImpl + val scheduledWork = workManager.workDatabase.workSpecDao().scheduledWork + scheduledWork.forEach { + Utils.d("WorkerUtils", "Work: ${it.id} at ${(it.periodStartTime + it.initialDelay).formatDate()}. State = ${it.state} (finished = ${it.state.isFinished})") + } + // remove finished work and other than SyncWorker + scheduledWork.removeAll { it.workerClassName != SyncWorker::class.java.canonicalName || it.isPeriodic || it.state.isFinished } + Utils.d("WorkerUtils", "Found ${scheduledWork.size} unfinished work") + // remove all enqueued work that had to (but didn't) run at some point in the past (at least 1min ago) + val failedWork = scheduledWork.filter { it.state == WorkInfo.State.ENQUEUED && it.periodStartTime + it.initialDelay < System.currentTimeMillis() - 1 * MINUTE * 1000 } + Utils.d("WorkerUtils", "${failedWork.size} work requests failed to start (out of ${scheduledWork.size} requests)") + if (rescheduleIfFailedFound) { + if (failedWork.isNotEmpty()) { + Utils.d("WorkerUtils", "App Manager detected!") + EventBus.getDefault().postSticky(AppManagerDetectedEvent(failedWork.map { it.periodStartTime + it.initialDelay })) + } + if (scheduledWork.size - failedWork.size < 1) { + Utils.d("WorkerUtils", "No pending work found, scheduling next:") + onReschedule() + } + } else { + Utils.d("WorkerUtils", "NOT rescheduling: waiting to open the activity") + if (scheduledWork.size < 1) { + Utils.d("WorkerUtils", "No work found *at all*, scheduling next:") + onReschedule() + } + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/DialogExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/DialogExtensions.kt new file mode 100644 index 00000000..5bf46d16 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/DialogExtensions.kt @@ -0,0 +1,44 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-30. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs + +import android.text.InputType +import android.view.LayoutInflater +import androidx.core.view.isVisible +import androidx.core.widget.addTextChangedListener +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.google.android.material.textfield.TextInputEditText +import pl.szczodrzynski.edziennik.databinding.DialogEditTextBinding +import pl.szczodrzynski.edziennik.isNotNullNorBlank + +fun MaterialAlertDialogBuilder.input( + message: CharSequence? = null, + type: Int = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE, + hint: CharSequence? = null, + value: CharSequence? = null, + changeListener: ((editText: TextInputEditText, input: String) -> Boolean)? = null, + positiveButton: Int? = null, + positiveListener: ((editText: TextInputEditText, input: String) -> Boolean)? = null +): MaterialAlertDialogBuilder { + val b = DialogEditTextBinding.inflate(LayoutInflater.from(context), null, false) + b.title.text = message + b.title.isVisible = message.isNotNullNorBlank() + b.text1.hint = hint + b.text1.inputType = type + b.text1.setText(value) + b.text1.addTextChangedListener { text -> + if (changeListener?.invoke(b.text1, text?.toString() ?: "") != false) + b.text1.error = null + } + if (positiveButton != null) { + setPositiveButton(positiveButton) { dialog, _ -> + if (positiveListener?.invoke(b.text1, b.text1.text?.toString() ?: "") != false) + dialog.dismiss() + } + } + setView(b.root) + + return this +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/GenericDialog.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/GenericDialog.java deleted file mode 100644 index df691a58..00000000 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/GenericDialog.java +++ /dev/null @@ -1,48 +0,0 @@ -package pl.szczodrzynski.edziennik.ui.dialogs; - -import android.content.Context; -import android.view.View; - -import com.afollestad.materialdialogs.MaterialDialog; - -import pl.szczodrzynski.edziennik.App; - -public class GenericDialog { - private App app; - private Context context; - - public GenericDialog(Context context) { - this.context = context; - } - - private MaterialDialog dialog; - private View dialogView; - - public void positiveButton() - { - - } - - public void show(App _app) - { - this.app = _app; - dialog = new MaterialDialog.Builder(context) - .title("Dialog title") - //.customView(R.layout.dialog_register_exam_add, true) - .positiveText("Positive") - .negativeText("Negative") - .autoDismiss(false) - .onPositive((dialog, which) -> positiveButton()) - .onNegative((dialog, which) -> dialog.dismiss()) - .show(); - - dialogView = dialog.getCustomView(); - assert dialogView != null; - - // USE NavView.TextView.* instead - /*TypedValue typedValue = new TypedValue(); - Resources.Theme theme = context.getTheme(); - theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true); - @ColorInt int primaryTextColor = typedValue.data;*/ - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/MessagesConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/MessagesConfigDialog.kt new file mode 100644 index 00000000..e42bf61f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/MessagesConfigDialog.kt @@ -0,0 +1,66 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-14. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.databinding.MessagesConfigDialogBinding + +class MessagesConfigDialog( + private val activity: AppCompatActivity, + private val reloadOnDismiss: Boolean = true, + private val onShowListener: ((tag: String) -> Unit)? = null, + private val onDismissListener: ((tag: String) -> Unit)? = null +) { + companion object { + const val TAG = "MessagesConfigDialog" + } + + private val app by lazy { activity.application as App } + private val config by lazy { app.config.ui } + private val profileConfig by lazy { app.config.forProfile().ui } + + private lateinit var b: MessagesConfigDialogBinding + private lateinit var dialog: AlertDialog + + init { run { + if (activity.isFinishing) + return@run + b = MessagesConfigDialogBinding.inflate(activity.layoutInflater) + onShowListener?.invoke(TAG) + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.menu_messages_config) + .setView(b.root) + .setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() } + .setOnDismissListener { + saveConfig() + onDismissListener?.invoke(TAG) + if (reloadOnDismiss) (activity as? MainActivity)?.reloadTarget() + } + .create() + loadConfig() + dialog.show() + }} + + private fun loadConfig() { + b.config = profileConfig + + b.greetingText.setText( + profileConfig.messagesGreetingText ?: "\n\nZ poważaniem\n${app.profile.accountOwnerName}" + ) + } + + private fun saveConfig() { + val greetingText = b.greetingText.text?.toString()?.trim() + if (greetingText.isNullOrEmpty()) + profileConfig.messagesGreetingText = null + else + profileConfig.messagesGreetingText = "\n\n$greetingText" + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/QrScannerDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/QrScannerDialog.kt new file mode 100644 index 00000000..d02f5a3f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/QrScannerDialog.kt @@ -0,0 +1,62 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-12-19. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import me.dm7.barcodescanner.zxing.ZXingScannerView +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.dp +import kotlin.coroutines.CoroutineContext + +class QrScannerDialog( + val activity: AppCompatActivity, + val onCodeScanned: (text: String) -> Unit, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "QrScannerDialog" + } + + private lateinit var app: App + private lateinit var scannerView: ZXingScannerView + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + scannerView = ZXingScannerView(activity) + scannerView.setPadding(0, 16.dp, 2.dp, 0) + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.qr_scanner_dialog_title) + .setView(scannerView) + .setPositiveButton(R.string.close) { dialog, _ -> + dialog.dismiss() + } + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + + scannerView.setResultHandler { + scannerView.stopCamera() + dialog.dismiss() + onCodeScanned(it.text) + } + scannerView.startCamera() + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt new file mode 100644 index 00000000..10853812 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/RegisterUnavailableDialog.kt @@ -0,0 +1,94 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-9-3. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs + +import android.text.method.LinkMovementMethod +import android.view.LayoutInflater +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import coil.load +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.BuildConfig +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.api.szkolny.response.RegisterAvailabilityStatus +import pl.szczodrzynski.edziennik.databinding.DialogRegisterUnavailableBinding +import pl.szczodrzynski.edziennik.onClick +import pl.szczodrzynski.edziennik.utils.Utils +import kotlin.coroutines.CoroutineContext + +class RegisterUnavailableDialog( + val activity: AppCompatActivity, + val status: RegisterAvailabilityStatus, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "RegisterUnavailableDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + + if (!status.available && status.userMessage != null) { + val b = DialogRegisterUnavailableBinding.inflate(LayoutInflater.from(activity), null, false) + b.message = status.userMessage + if (status.userMessage.image != null) + b.image.load(status.userMessage.image) + if (status.userMessage.url != null) { + b.readMore.onClick { + Utils.openUrl(activity, status.userMessage.url) + } + } + b.text.movementMethod = LinkMovementMethod.getInstance() + dialog = MaterialAlertDialogBuilder(activity) + .setView(b.root) + .setPositiveButton(R.string.close) { dialog, _ -> + dialog.dismiss() + } + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + return@run + } + + val update = app.config.update + if (status.minVersionCode > BuildConfig.VERSION_CODE) { + if (update != null && update.versionCode >= status.minVersionCode) { + UpdateAvailableDialog(activity, update, true, onShowListener, onDismissListener) + } + else { + // this *should* never happen + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.update_available_title) + .setMessage(R.string.update_available_fallback) + .setPositiveButton(R.string.update_available_button) { dialog, _ -> + Utils.openGooglePlay(activity) + dialog.dismiss() + } + .setCancelable(false) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + } + return@run + } + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ServerMessageDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ServerMessageDialog.kt new file mode 100644 index 00000000..cebc4e04 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/ServerMessageDialog.kt @@ -0,0 +1,51 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-1-19. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import kotlin.coroutines.CoroutineContext + +class ServerMessageDialog( + val activity: AppCompatActivity, + val title: String, + val message: CharSequence, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "ServerMessageDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(title) + .setMessage(message) + .setPositiveButton(R.string.close) { dialog, _ -> + dialog.dismiss() + } + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/UpdateAvailableDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/UpdateAvailableDialog.kt new file mode 100644 index 00000000..6446170b --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/UpdateAvailableDialog.kt @@ -0,0 +1,67 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2020-9-3. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs + +import android.text.Html +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.api.szkolny.response.Update +import pl.szczodrzynski.edziennik.sync.UpdateDownloaderService +import kotlin.coroutines.CoroutineContext + +class UpdateAvailableDialog( + val activity: AppCompatActivity, + val update: Update, + val mandatory: Boolean = update.updateMandatory, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "UpdateAvailableDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + init { run { + if (activity.isFinishing) + return@run + if (update.versionCode <= BuildConfig.VERSION_CODE) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.update_available_title) + .setMessage( + R.string.update_available_format, + BuildConfig.VERSION_NAME, + update.versionName, + update.releaseNotes?.let { Html.fromHtml(it) } ?: "---" + ) + .setPositiveButton(R.string.update_available_button) { dialog, _ -> + activity.startService(Intent(app, UpdateDownloaderService::class.java)) + dialog.dismiss() + } + .also { + if (!mandatory) + it.setNeutralButton(R.string.update_available_later, null) + } + .setCancelable(!mandatory) + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/agenda/AgendaConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/agenda/AgendaConfigDialog.kt new file mode 100644 index 00000000..150d7d65 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/agenda/AgendaConfigDialog.kt @@ -0,0 +1,93 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-4-10. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.agenda + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.data.db.entity.Profile +import pl.szczodrzynski.edziennik.data.db.entity.Profile.Companion.REGISTRATION_ENABLED +import pl.szczodrzynski.edziennik.databinding.DialogConfigAgendaBinding +import pl.szczodrzynski.edziennik.ui.dialogs.sync.RegistrationConfigDialog +import java.util.* + +class AgendaConfigDialog( + private val activity: AppCompatActivity, + private val reloadOnDismiss: Boolean = true, + private val onShowListener: ((tag: String) -> Unit)? = null, + private val onDismissListener: ((tag: String) -> Unit)? = null +) { + companion object { + const val TAG = "AgendaConfigDialog" + } + + private val app by lazy { activity.application as App } + private val config by lazy { app.config.ui } + private val profileConfig by lazy { app.config.forProfile().ui } + + private lateinit var b: DialogConfigAgendaBinding + private lateinit var dialog: AlertDialog + + init { run { + if (activity.isFinishing) + return@run + b = DialogConfigAgendaBinding.inflate(activity.layoutInflater) + onShowListener?.invoke(TAG) + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.menu_agenda_config) + .setView(b.root) + .setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() } + .setOnDismissListener { + saveConfig() + onDismissListener?.invoke(TAG) + if (reloadOnDismiss) (activity as? MainActivity)?.reloadTarget() + } + .create() + loadConfig() + dialog.show() + }} + + private fun loadConfig() { + b.config = profileConfig + b.isAgendaMode = profileConfig.agendaViewType == Profile.AGENDA_DEFAULT + + b.eventSharingEnabled.isChecked = app.profile.enableSharedEvents + && app.profile.registration == REGISTRATION_ENABLED + b.eventSharingEnabled.onChange { _, isChecked -> + if (isChecked && app.profile.registration != REGISTRATION_ENABLED) { + b.eventSharingEnabled.isChecked = false + val dialog = RegistrationConfigDialog(activity, app.profile, onChangeListener = { enabled -> + b.eventSharingEnabled.isChecked = enabled + setEventSharingEnabled(enabled) + }, onShowListener, onDismissListener) + dialog.showEnableDialog() + return@onChange + } + setEventSharingEnabled(isChecked) + } + } + + private fun setEventSharingEnabled(enabled: Boolean) { + if (enabled == app.profile.enableSharedEvents) + return + app.profile.enableSharedEvents = enabled + app.profileSave() + MaterialAlertDialogBuilder(activity) + .setTitle(R.string.event_sharing) + .setMessage( + if (enabled) + R.string.settings_register_shared_events_dialog_enabled_text + else + R.string.settings_register_shared_events_dialog_disabled_text + ) + .setPositiveButton(R.string.ok, null) + .show() + } + + private fun saveConfig() { + + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncConfigDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncConfigDialog.kt new file mode 100644 index 00000000..13dcb6f9 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncConfigDialog.kt @@ -0,0 +1,117 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2021-3-20. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.bell + +import android.widget.TextView +import android.widget.Toast +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import androidx.core.widget.addTextChangedListener +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.google.android.material.textfield.TextInputEditText +import com.google.android.material.textfield.TextInputLayout +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.* +import pl.szczodrzynski.edziennik.utils.models.Time +import kotlin.coroutines.CoroutineContext + +class BellSyncConfigDialog( + val activity: AppCompatActivity, + val onChangeListener: (() -> Unit)? = null, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "BellSyncConfigDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + // local variables go here + + private fun parse(input: String): Pair? { + if (input.length < 8) { + return null + } + if (input[2] != ':' || input[5] != ':') { + return null + } + val multiplier = when { + input[0] == '+' -> 1 + input[0] == '-' -> -1 + else -> return null + } + val time = Time.fromH_m_s("0" + input.substring(1)) + + return time to multiplier + } + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.bell_sync_title) + .setView(R.layout.dialog_edit_text) + .setPositiveButton(R.string.ok, null) + .setNegativeButton(R.string.cancel, null) + .setNeutralButton(R.string.reset) { _, _ -> + app.config.timetable.bellSyncDiff = null + app.config.timetable.bellSyncMultiplier = 0 + onChangeListener?.invoke() + } + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .show() + + val message = dialog.findViewById(android.R.id.title) + val editText = dialog.findViewById(android.R.id.text1) + val textLayout = dialog.findViewById(R.id.text_input_layout) + + message?.setText(R.string.bell_sync_adjust_content) + editText?.hint = "±H:MM:SS" + editText?.setText(app.config.timetable.bellSyncDiff?.let { + (if (app.config.timetable.bellSyncMultiplier == -1) "-" else "+") + it.stringHMS + } ?: "+0:00:00") + editText?.addTextChangedListener { text -> + val input = text?.toString() + textLayout?.error = + if (input != null && parse(input) == null) + activity.getString(R.string.bell_sync_adjust_error) + else + null + } + + dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.onClick { + val input = editText?.text?.toString() ?: return@onClick + val parsed = parse(input) + if (parsed == null) { + Toast.makeText(activity, R.string.bell_sync_adjust_error, Toast.LENGTH_SHORT).show() + return@onClick + } + + val (time, multiplier) = parsed + app.config.timetable.bellSyncDiff = + if (time.value == 0) + null + else + time + app.config.timetable.bellSyncMultiplier = multiplier + + onChangeListener?.invoke() + dialog.dismiss() + } + }} +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncDialog.kt new file mode 100644 index 00000000..ab1b1f8f --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncDialog.kt @@ -0,0 +1,100 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-20 + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.bell + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.launch +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.databinding.DialogBellSyncBinding +import pl.szczodrzynski.edziennik.startCoroutineTimer +import pl.szczodrzynski.edziennik.utils.models.Time +import kotlin.coroutines.CoroutineContext + +class BellSyncDialog( + val activity: AppCompatActivity, + private val bellTime: Time, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + + companion object { + const val TAG = "BellSyncDialog" + } + + private lateinit var job: Job + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + private lateinit var dialog: AlertDialog + private lateinit var b: DialogBellSyncBinding + + private val app by lazy { activity.application as App } + + private var counterJob: Job? = null + + private val actualBellDiff: Pair + get() { + val now = Time.getNow() + val bellDiff = Time.diff(now, bellTime) + val multiplier = if (bellTime > now) -1 else 1 + return Pair(bellDiff, multiplier) + } + + init { apply { + if (activity.isFinishing) + return@apply + job = Job() + b = DialogBellSyncBinding.inflate(activity.layoutInflater) + onShowListener?.invoke(TAG) + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.bell_sync_title) + .setView(b.root) + .setNeutralButton(R.string.cancel) { dialog, _ -> dialog.dismiss() } + .setOnDismissListener { + counterJob?.cancel() + onDismissListener?.invoke(TAG) + } + .show() + initView() + }} + + private fun initView() { + b.bellSyncButton.setOnClickListener { + val (bellDiff, multiplier) = actualBellDiff + val bellDiffText = (if (multiplier == -1) '-' else '+') + bellDiff.stringHMS + app.config.timetable.bellSyncDiff = bellDiff + app.config.timetable.bellSyncMultiplier = multiplier + + MaterialAlertDialogBuilder(activity) + .setTitle(R.string.bell_sync_title) + .setMessage(app.getString(R.string.bell_sync_results, bellDiffText)) + .setPositiveButton(R.string.ok) { resultsDialog, _ -> + resultsDialog.dismiss() + dialog.dismiss() + if (activity is MainActivity) activity.reloadTarget() + } + .show() + } + + if (Time.diff(Time.getNow(), bellTime) > Time(2, 0, 0)) { // Easter egg ^^ + b.bellSyncButton.setImageDrawable(app.resources.getDrawable(R.drawable.ic_bell_wtf)) // wtf + } + + launch { + counterJob = startCoroutineTimer(repeatMillis = 500) { + val (bellDiff, multiplier) = actualBellDiff + val bellDiffText = (if (multiplier == -1) '-' else '+') + bellDiff.stringHMS + b.bellSyncHowto.text = app.getString(R.string.bell_sync_howto, bellTime.stringHM, bellDiffText) + } + } + } +} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncTimeChooseDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncTimeChooseDialog.kt new file mode 100644 index 00000000..4116ab83 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/bell/BellSyncTimeChooseDialog.kt @@ -0,0 +1,167 @@ +/* + * Copyright (c) Kacper Ziubryniewicz 2019-12-20 + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.bell + +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.* +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.MainActivity +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.data.db.entity.Lesson +import pl.szczodrzynski.edziennik.databinding.DialogBellSyncTimeChooseBinding +import pl.szczodrzynski.edziennik.utils.TextInputDropDown +import pl.szczodrzynski.edziennik.utils.models.Date +import pl.szczodrzynski.edziennik.utils.models.Time +import kotlin.coroutines.CoroutineContext + +class BellSyncTimeChooseDialog( + val activity: AppCompatActivity, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + + companion object { + const val TAG = "BellSyncTimeChooseDialog" + + private const val MAX_DIFF_MINUTES = 10 + } + + private lateinit var job: Job + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + private lateinit var dialog: AlertDialog + private lateinit var b: DialogBellSyncTimeChooseBinding + + private val app by lazy { activity.application as App } + + private val today = Date.getToday() + private val selectedTime: Time? + get() = b.timeDropdown.selected?.tag as Time? + + init { apply { + if (activity.isFinishing) + return@apply + job = Job() + b = DialogBellSyncTimeChooseBinding.inflate(activity.layoutInflater) + onShowListener?.invoke(TAG) + dialog = MaterialAlertDialogBuilder(activity) + .setTitle(R.string.bell_sync_title) + .setView(b.root) + .setPositiveButton(R.string.ok) { dialog, _ -> + dialog.dismiss() + selectedTime?.let { + BellSyncDialog(activity, it) + } + } + .setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() } + .setOnDismissListener { + onDismissListener?.invoke(TAG) + } + .create() + .apply { + setButton(AlertDialog.BUTTON_NEUTRAL, app.getString(R.string.reset)) { _, _ -> + showResetDialog() + } + } + + initView() + }} + + private fun initView() { + b.bellSyncHowto.text = app.getString(R.string.bell_sync_choose_howto) + + app.config.timetable.bellSyncDiff?.let { bellDiff -> + val multiplier = app.config.timetable.bellSyncMultiplier + val bellDiffText = (if (multiplier == -1) '-' else '+') + bellDiff.stringHMS + b.bellSyncHowto.text = app.getString(R.string.concat_2_strings, + app.getString(R.string.bell_sync_choose_howto), + app.getString(R.string.bell_sync_current_dialog, bellDiffText) + ) + } + + loadTimeList() + } + + private fun checkForLessons(timeList: List

    Unable to load

    " + e.getLocalizedMessage() + "

    ", "text/html", charsetName); - } - return dialog; - } - - private String colorToHex(int color) { - return Integer.toHexString(color).substring(2); - } -} diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.kt new file mode 100644 index 00000000..40ea90b2 --- /dev/null +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/changelog/ChangelogDialog.kt @@ -0,0 +1,78 @@ +/* + * Copyright (c) Kuba Szczodrzyński 2019-12-30. + */ + +package pl.szczodrzynski.edziennik.ui.dialogs.changelog + +import android.os.Build +import android.text.Html +import android.widget.ScrollView +import android.widget.TextView +import androidx.appcompat.app.AlertDialog +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import pl.szczodrzynski.edziennik.App +import pl.szczodrzynski.edziennik.R +import pl.szczodrzynski.edziennik.dp +import pl.szczodrzynski.edziennik.utils.BetterLinkMovementMethod +import kotlin.coroutines.CoroutineContext + +class ChangelogDialog( + val activity: AppCompatActivity, + val onShowListener: ((tag: String) -> Unit)? = null, + val onDismissListener: ((tag: String) -> Unit)? = null +) : CoroutineScope { + companion object { + private const val TAG = "ChangelogDialog" + } + + private lateinit var app: App + private lateinit var dialog: AlertDialog + + private val job = Job() + override val coroutineContext: CoroutineContext + get() = job + Dispatchers.Main + + init { run { + if (activity.isFinishing) + return@run + onShowListener?.invoke(TAG) + app = activity.applicationContext as App + val textView = TextView(activity) + textView.setPadding(24.dp, 24.dp, 24.dp, 0) + + var text = app.assets.open("pl-changelog.html").bufferedReader().use { + it.readText() + } + + val commitsUrlPrefix = "https://github.com/szkolny-eu/szkolny-android/commits?author=" + text = text.replace("""\[(.+?)]\(@([A-z0-9-]+)\)""".toRegex(), "$1") + text = text.replace("""\s@([A-z0-9-]+)""".toRegex(), " @$1") + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + textView.text = Html.fromHtml(text) + } + else { + textView.text = Html.fromHtml(text.replace("
    •  + &nbsp;%s, lies: ja]]> + &nbsp;%s, lies: nein]]> + Antworten + %s um %s + Suche + %d Nachrichten gefunden + Nachricht wurde gesendet + Gelöscht + Posteingang + Gesendet + Mehr + Versuchen Sie, Wi-Fi oder mobile Daten einzuschalten + Sie sind offline + Weiter + Nein + Heute gibt es keine Lektionen! + Keine Berechtigungen + Nein, danke + Nicht jetzt + Keine Daten zum Verhalten der Schüler. + Andere: + %s, Punkte: %s + Loben: + Zusammenfassung - Laden… + Zusammenfassung - Semester %d + Zusammenfassung - das ganze Jahr + Warnungen: + Benachrichtigung + Abwesenheit + ntschuldigte Abwesenheit + Schulankündigung von %s: %s + %1$s auf Lektion %2$s auf Tag %3$s + %1$s am Tag %3$s + Verspätung + Entschuldigte Verspätung + Fehler beim Suchen nach Updates + Benachrichtigung über den Fortschritt der Datensynchronisation + Synchronisation + Benachrichtigungen über neue Daten im E-Klassenbuch + Benachrichtigungen + Benachrichtigungen über neue Daten im E-Klassenbuch (kein Ton - während ruhiger Zeiten) + Benachrichtigungen (Nachtruhe) + Benachrichtigungen über neue Versionen der App + App-Aktualisierungen + Benachrichtigungen über ein Problem, das eine Benutzerinteraktion erfordert (z.B. Captcha-Überprüfung). Es wird empfohlen, diese Kategorie eingeschaltet zu lassen + Aktion erforderlich + Klicken, um alle Benachrichtigungen zu sehen + Freier Tag + Updates herunterladen… + %1$s auf %2$s von %3$s + unbekanntes Subjekt + %1$s auf %2$s + Sind Sie sicher, dass Sie diese Einstellungen anwenden möchten?\n\nSie werden Informationen über einige Daten nicht sehen, so dass Sie wichtige Nachrichten oder Noten verpassen könnten.\n\nDie Einstellungen werden auf das aktuell ausgewählte Profil angewendet + Abbrechen + Szkolny.eu: Fehler + Fehler beim herunterladen von Daten für Profil %s + Erneut versuchen + Szkolny.eu: Herunterladen + Daten herunterladen + Aktualisieren + Neue Note (%s) auf %s + Hausaufgaben auf %s für %s + Hausaufgaben für %s + %s auf %s - %s + Heute ist %2$d die Glücksnummer. + Die Glücksnummer für %1$s ist %2$d. + Die Glücksnummer für morgen ist %2$d. + Du hast heute ein Glücksnummer (%2$d) + %1$s Sie werden die Glücksnummer haben! (%2$d) + Morgen ist es Ihre Glücksnummer! (%2$d) + Ungelesene Nachricht von %s: %s + Neue Benachrichtigungen: %d + Kein Update verfügbar + %s von %s auf %s + Neuer Notiz + Neues Lob + Neuer Warnung + Freigabe + %s geteilt %s auf %s - %s + %s geändert %s auf %s - %s + %s entfernt %s auf %s - %s + Neue Lehrerabwesenheit für %s + Anwesenheit + Profilarchivierung + Fehler + Nachricht vom Entwickler + Benachrichtigung + Glücksnummer + Schulankündigung + Neues Ereignis + Neue Note + Neue Hausaufgabe + Neue Nachricht + Neue geteilte Ereignis + Geteilte Hausaufgaben + Neue Abwesenheit von Lehrer + Neuer Notiz + Geteilte Ereignis entfernt + Server-Nachricht + Stundenplanänderung + Lektionsänderung + Update + Szkolny.eu: Update + Klicken Sie zum Herunterladen der Version %s + Update verfügbar + LIBRUS® Rodzina einloggen: erfordert eine Lösung für die Captcha-Aufgabe. Klicken Sie hier, um sich weiter im Tagebuch anzumelden. + Das Problem, das die Synchronisierung verhindert, muss vom Benutzer gelöst werden. Klicken Sie für weitere Informationen + Erforderliche Aktion in der App + Keine Benachrichtigungen + OK + Öffnen + Öffnen %s + Keine App, die diesen Dateityp öffnet + Andere + Bitte warten + Datenschutzerklärung + Profil %s wurde archiviert. Die Synchronisierung wurde wegen der Möglichkeit eines Datenverlusts beim nächsten herunterladen deaktiviert.\n\nSie können die in der App in diesem Profil gespeicherten Daten weiterhin anzeigen.\n\nBachten Sie, dass einige Nachrichten möglicherweise nicht korrekt heruntergeladen werden + Profil wird archiviert + Profil %s wurde archiviert, weil das Schuljahr am %s endete. Synchronisirung ist deaktiviert, aber Sie können die Daten dieses Profils trotzdem durchsuchen. + Wenn dies zu lange dauert, versuchen Sie, die App neu zu starten + Wenn dies zu lange dauert, versuchen Sie, die App neu zu starten + App laden… + Einstellungen + Profil entfernen + Sind Sie sicher? + Sie versuchen, das Profil %s zu entfernen. Das bedeutet, dass Sie die Daten dieses Profils (Noten, Stundenpläne, Ereignissen…) aus der App entfernen.\n\nSie können die meisten Daten wiederherstellen, indem Sie sich erneut einloggen.\n\nWollen Sie wirklich Profil %s entfernen? + Einen QR-Code scannen + Niemals + Später + etzt bewerten + Zeigen Sie, dass Ihnen Szkolny.eu gefällt - bewerten Sie die App und machen Sie sie noch besser! + Aktualisieren + Benutzerregistrierung aufheben… + Einige Funktionen wie Ereignisfreigabe oder Benachrichtigungsweiterleitung können nicht mehr verwendet werden.\n\nDie Funktion kann je nach ausgewähltem Profil aktiviert / deaktiviert werden. + Gemeinsame Ereignisse herunterladen… + Die Registrierung erfolgt automatisch, wenn diese Option aktiviert ist. Sie können Ereignisse erstellen und empfangen, die mit anderen Schülern in Ihrer Klasse geteilt werden. Dank dessen können Sie Elemente, die nicht vom Lehrer gespeichert wurden, zum Klassenbuch hinzufügen.\n\nStellen Sie sicher, dass Sie die Bestimmungen der Datenschutzrichtlinie lesen und die Bestimmungen akzeptieren. + Um das Ereignis freigeben zu können, müssen Sie die Serverregistrierungsoption aktivieren. Auf diese Weise können Sie Ereignisse erstellen und empfangen, die in Ihrer Klasse geteilt werden.\n\nWenn Sie auf OK klicken, wird diese automatisch aktiviert.\n\nStellen Sie sicher, dass Sie die Bedingungen lesen und akzeptieren. + Ereignisse teilen + Szkolny.eu Server-Registrierung + Löschen + gelöschtet + Melden + Melden Sie einen Fehler + Zurücksetzen + Speichern + Gespeichert + Keine Schulankündigungen + Nachricht senden… + Änderungsprotokoll + Oder besser nicht klicken… + Klicken Sie hier, um eine unerwartete Ausnahme auszulösen + Treten Sie unserem Discord-Server bei! + Discord Server + Hinweis. Diese Option funktioniert möglicherweise auf einigen Geräten und in einigen Teilen der App nicht. + App-Sprache ändern + Deutsch + Sprache der App + Open-Source-Lizenzen + Datenschutzrichtlinie + E-Klassenbuch + © Kuba Szczodrzyński && Kacper Ziubryniewicz\nSeptember 2018 - 2021 + Klicken Sie hier, um nach Aktualisierungen zu suchen + Aktualisierung + Version + Mehr + Benachrichtigungsweiterleitung + Bild ändern + Name ändern + Geben Sie einen Namen für das Profil ein + Ändern Sie den Profilnamen + Profil + Deaktivieren Sie bestimmte Arten von Benachrichtigungen + Benachrichtigungen filtern + Benachrichtigungen über dieses Profil anzeigen + Benachrichtigung über neue Daten + Profilbild entfernen + Entfernt das Profil und alle seine Daten + Abmelden / Profil entfernen + Angemeldet als %s + Schließen Sie dieses Profil bei der Synchronisierung ein + Synchronisieren dieses Profil + Einige Funktionen wie Ereignisfreigabe oder Benachrichtigungsweiterleitung können nicht mehr verwendet werden.\n\nDie Funktion kann je nach ausgewähltem Profil aktiviert / deaktiviert werden. + Deaktivieren der Registrierung + Ein Fehler ist aufgetreten, aber Sie sollten sich nicht darum kümmern + Beendet: Erfolg + Benutzerregistrierung aufheben… + Deaktivieren der Registrierung + Durch die Verwendung der Funktion stimme ich den unten in den Einstellungen verfügbaren Datenschutzbestimmungen zu.\n\nDie Funktion kann je nach ausgewähltem Profil aktiviert / deaktiviert werden. + Registrierung erlauben + Nutzen Sie die zusätzlichen Funktionen der App + Registrierung erlauben + Durchschnittswerte beider Semester durchschnittlich + Durchschnitt beider Semester + Endnote von 1.sem + Durchschnitt von 2. sem + Note von 1.sem + Durchschnitt von 2. sem + Durchschnitt von 1. sem + Endnote von 2. sem + Durchschnitt von 1. sem + Note von 2. sem + Der Durchschnitt der Endnoten beider Semester + Durchschnitt der beiden Endnoten + Durchschnitt aller Noten aus beiden Semestern + Durchschnitt aller Noten + Wie berechnet man den Jahresenddurchschnitt?\n\nSie können für jedes Profil eine andere Option festlegen. + Berechnung des Jahresenddurchschnitts + Berechnung des Jahresenddurchschnitts + Aktuelle Zeit: (nicht eingestellt) + Aktuelle Zeit: %s + Passen Sie die Glockensynchronisation an + Beim Warten auf das Ende der Lektion + Zählen Sie die Zeit in Sekunden herunter + Zählen Sie die Note 0 nicht zum Durchschnitt + Dieses E-Register ist noch nicht implementiert + Sie erhalten keine geteilten Ereignisse mehr und können sie nicht mehr teilen. + Sie erhalten geteilte Ereignisse von anderen Personen in Ihrer Klasse + Teile Tests in deiner Klasse + Aktivieren Sie die Ereignisfreigabe + Zeigen Sie die Abwesenheiten von Lehrern im Zeitplan an + Schwarzes Brett + Anwesenheiten + Klasse freie Tage + Klassenzimmern + Ereignisse/Zeitplan + Noten + Hausaufgaben + Glücksnummer + Nachrichten - empfangen + Nachrichten - gesendet + Warnungen/Lob + Punktnoten + Eltern-Lehrer-Treffen + Schulfreie Tagen + Lektionsänderungen und Absagen + Abwesenheiten von Lehrern + Stundenplan + Alle 7 Tage heruntergeladen + Dies kann die Datensynchronisation beschleunigen + Aktivieren / Deaktivieren von Synchronisierungselementen + Passen Sie App-Benachrichtigungen an, z. B. Ton oder Vibration + Einstellungen für Systembenachrichtigungen + Nachtruhe + Startzeit einstellen + Endzeit einstellen + Deaktiviert + Keine Benachrichtigung ertönt von %s bis %s + eine Benachrichtigung ertönt von %s bis %s am nächsten Tag + Nachtruhe + Wann sollen Daten aus dem E-Register synchronisiert werden? + Automatische Synchronisierung + Deaktiviert + Daten alle %s herunterladen + Automatische Synchronisierung + Synchronisation und Benachrichtigungen + Über App-Aktualisierungen benachrichtigen + Benachrichtigungen auf Ihrem PC anzeigen + Benachrichtigungsweiterleitung + Beschränkt die Verwendung von Mobilfunkdaten + Nur über Wi-Fi synchronisieren + App-Hintergrund entfernen + App-Hintergrund festlegen + Bitte, tun Sie das nicht + App-Hintergrund ändern + Hintergrund der Menüüberschrift wiederherstellen + Hintergrund für Menüüberschrift festlegen + Hintergrund der Menüüberschrift ändern + Hinweis. Einige Funktionen sind möglicherweise in einigen E-Registern nicht verfügbar + Mini-Menü Tasten + Passen Sie die Mini-Menüschaltflächen an + Ein Menü auf der linken Seite anzeigen + Mini-Menü anzeigen + Öffnen Sie das Menü mit der Zurück-Taste + Schlittenfahrt im Schnee + Jingle Bells, Jingle Bells + Brrrr + Bajo jajo, bajo jajo + Rosa + System + Thema + Aussehen + Teilen + Teilen über… + Daten Teilen… + Zeitplan + Noten + Hausaufgaben + Nachrichten + Stundenplan + Ein Fehler ist aufgetreten + Nach Datum + Nach Thema + Alle Fächer + Semester 1 + Semester 2 + Ganzes Jahr + Sicher! + Autorisierung + Benachrichtigungen erstellen + Kontoinformationen herunterladen + Kontoliste herunterladen + Zertifikat herunterladen + Tokens aktualisieren + Anmelden… + Datenkonvertierung + Push-Benachrichtigungen konfigurieren + Synchronisieren + Kontoinformationen herunterladen + Schulankündigungen herunterladen + Anwesenheit herunterladen + Anwesenheitskategorien herunterladen + Kategorie der Schulnoten aus Verhaltens herunterladen + Schulnoten aus Verhaltens herunterladen + Zeitplan herunterladen + Klasseninformationen herunterladen + Klassenzimmer herunterladen + Kategorie von Beschreibende Schulnoten herunterladen + Beschreibende Schulnoten herunterladen + Wörterbuch herunterladen + Ereigniskategorien herunterladen + Ereignisse herunterladen + Testen herunterladen + Notenkategorie herunterladen + Notenkommentare herunterladen + Notendetails herunterladen + Noten herunterladen + Hausaufgaben herunterladen + Glücksnummer herunterladen + Nachrichten herunterladen + Empfangene Nachrichten herunterladen + Gesendete Nachrichten herunterladen + Notizendetails herunterladen + Notizen herunterladen + Kategorien von Punktnoten herunterladen + Punktnoten herunterladen + Vorschlagene Noten herunterladen + Treffen mit Eltern herunterladen + Freien Schultagen herunterladen + Schulinformationen herunterladen + Geteilte Ereignisse herunterladen + Schulfächer herunterladen + Abwesenheit von Lehrern herunterladen + Abwesenheitsklassen für Lehrer herunterladen + Klassengruppen herunterladen + Stundenplan herunterladen + Stundenplan änderungen herunterladen + Lehrerliste herunterladen + Daten aktualisieren… + Laden… + synchronisiert + Nicht übereinstimmender Name des Benutzerkontos. Melden Sie einen Fehler. + Anwendungsserverfehler + Das ausgewählte Klassenbuch ist archiviert + Anhang kann nicht heruntergeladen werden. Das Netzwerklaufwerk mit dem Anhang ist nicht verfügbar. + Melden Sie einen Fehler + Synchronisierungsfehler + Ungültiges Gerät + Ungültige Anmeldedaten + Ungültiger Schulname oder verbotene Zeichen + Die Serveradresse ist ungültig. Stellen Sie sicher, dass es korrekt eingegeben wurde und keine Leerzeichen enthält. + Ungültiges Token angegeben. + Das LIBRUS® Rodzina-Konto hat die Verbindung zum LIBRUS® Synergia-Konto verloren. Melden Sie sich bei portal.librus.pl oder der offiziellen "LIBRUS®" App an und befolgen Sie die Anweisungen zur Reparatur Ihres Kontos. + Das LIBRUS® Rodzina-Konto wurde nicht aktiviert. Aktivieren Sie das Konto mit der E-Mail, die Sie erhalten haben. + Anmeldefehler + Technische Pause\n\nVersuchen Sie es später erneut + API-Adresse nicht gefunden. Versuchen Sie erneut, sich am Gerät anzumelden. + Keine Internetverbindung\n\nMögliche E-Klassenbuch-Server sind überlastet oder haben eine technische Pause. + Login erfolgreich + Altes Passwort wurde verwendet + Dieses Profil wurde archiviert, daher ist eine Synchronisierung nicht möglich. + Profil nicht gefunden. Versuchen Sie, sich abzumelden und erneut anzumelden. + Diesem Konto sind keine Schüler zugeordnet.\n\nStellen Sie sicher, dass der Schüler Ihrem Konto zugewiesen ist. Überprüfen Sie die Desktop-Version der E-Klassenbuch-Website. + Student %s ist diesem Konto im Klassenbuch nicht zugeordnet (Login: %s).\n\nVersuchen Sie erneut, sich anzumelden, obwohl dies möglicherweise auf eine technische Unterbrechung im E-Klassenbuch hinweist. + Fehler beim Speichern der Daten. Melden Sie den Fehler. + Fehler beim Herstellen einer sicheren Verbindung. + Das LIBRUS® Synergia-Konto wurde nicht von einem Elternteil oder Erziehungsberechtigten aktiviert.\n\nLoggen Sie sich in portal.librus.pl ein und befolgen Sie die Anweisungen, um es zu aktivieren. + Auszeit + Unbekannter Fehler + Stundenplan herunterladen + Alles + Ansagen herunterladen… + Anwesenheits herunterladen… + Noten herunterladen… + Hausaufgaben herunterladen… + Empfangene Nachrichten herunterladen… + Gesendete Nachrichten herunterladen + Notizen herunterladen… + Alles synchronisieren… + Wählen Sie aus, welche Elemente synchronisiert werden sollen. + Stundenplan synchronisieren… + Manuelle Synchronisierung + Login Fehler + Die neuesten Daten werden möglicherweise nicht angezeigt + Melden + API-Antwort einschließen (empfohlen) + Fehler melden + Synchronisierungsdienst + Klicken Sie auf das Symbol, um alle Daten als gelesen zu markieren. + Benachrichtigungen + Klicken Sie auf die Menüüberschrift, um das Profil eines Schülers zu ändern oder hinzuzufügen. Hier finden Sie auch eine manuelle Synchronisierung aller Profile. + Profile ändern + Klassenlehrer + Bibliothekar + Andere + Elternteil + Elternrat + Pädagoge / Psychologe + Schulleiter + Schulverwalter + Schulelternrat + Sekretariat + Spezialist + Schüler + Administrator / Superadministrator + Lehrer + Kategorie durchsuchen + Übermorgen + Vorgestern + Bernstein + Schwarz / OLED + Blau + Schokolade + Dunkel + Dunkelblau + Dunkelgrün + Dunkelviolett + Dunkelrot + Indigo + Hell + Hellblau + Hellgrün + Hellviolett + Hellrot + Hellgelb + Violett + rot + Stundenplan anzeigen + Kein Lektionen an diesem Tag: + Freier Tag + Mit Änderungen für diese Woche (%s bis %s) + Druckbar (keine Änderungen, weniger Farben) + Namen des Schülerprofils anzeigen + Mit Änderungen für die nächste Woche (%s bis %s) + Keine Stundenplanänderungen + Druckbar (weniger Farben) + Dies kann einige Sekunden dauern… + Stunden erstellen + Der Umfang des generierten Plans + Für ausgewählte Woche + Profilnamen anzeigen + Namen von Lehrern anzeigen + Der Stundenplan wurde im Verzeichnis Szkolny.eu als Bilddatei gespeichert. \ N \ nSie können ihn sofort öffnen oder freigeben. + Gemacht! + Lektion abgesagt + Ersatz + Ersatz: anstelle von %s + Die Lektion wurde auf einen anderen Tag verschoben + Die Lektion wurde von einem anderen Tag verschoben + Die Lektion wurde von %s %s verschoben + Die Lektion wurde von %s verschoben + "Die Lektion wurde auf %s %s verschoben" + Die Lektion wurde auf %s verschoben + Datum + Wählen Sie das Datum + Wählen Sie das Thema aus + Zeit + Wählen Sie die Zeit + %s (Lektion %d) + Für diesen Tag wurden keine eigenen Lektionen hinzugefügt. + Bei jeder %s Lektion + Beinhaltet einen Stundenplan für jede Woche + Nach Schulfach + Einmal + Wiederholen + (kein Klassenzimmer) + Keinen Lektionen an diesem Tag + Keinen Lektionen an diesem Tag + (kein Name) + Synchronisieren + Der Stundenplan für diese Woche wurde noch nicht synchronisiert + Kein Stundenplan + für Woche %s + Wenden Sie sich an Ihren Tutor, um den Stundenplan zu erhalten. + Der Zeitplan ist nicht öffentlich + Kein Zeitplan + Datum auswählen + Synchronisierung Stundenplan für die ausgewählte Woche… + Heute + Alles synchroniesieren + Debuggen + Feedback + Entwürfe + Empfangene Nachrichten + Gesendeten Nachrichten + Müll + Profilmanager + Wechseln Sie das Semester + Profil ändern… + Heute + Morgen + Synchronisieren… + Unbekannt + Update erforderlich + Sie müssen die App aktualisieren, um sie verwenden zu können. Klicken Sie zum Herunterladen auf OK. + Sie versuchen, eine ältere Version der App auszuführen, deren Daten möglicherweise beschädigt werden. + Gepaarte Browser + Keine Verbindung zum Server. + Gepaart %s + Keine gepaaren Browser. + paaren Sie den Browser + Möchten Sie diesen Browser wirklich löschen? + Das Token sieht nicht gültig aus + Das kannst du nicht machen + trennen + Sie müssen die automatische Registrierung aktivieren, um die Benachrichtigungsweiterleitung verwenden zu können.\n\nWählen Sie in den Anmeldeeinstellungen \"Registrierung zulassen\". + Was willst du machen? + Was ist das? + Was ist neu? + Passen Sie das Widget an + Kombiniert - alle Profile + Wird geladen… + Kein Profil + Glücksnummer + Keine Benachrichtigungen + Benachrichtigungen + Aktualisieren + Synchronisieren + Verwenden Sie eine größere Schriftart + Keinen Lektionen am ausgewählten Tag. + Keine Lektionen für den nächsten 7 Tage. + Der Stundenplan wurde nicht heruntergeladen.\n\nÖffnen Sie die App und synchronisieren Sie sie, um den Stundenplan herunterzuladen. + Das ausgewählte Profil ist nicht vorhanden.\nLöschen Sie das Widget und versuchen Sie es erneut. + Keine Lektionen für den nächsten 7 Tage. + Der Zeitplan wurde nicht heruntergeladen. + Stundenplan + Kombinierter Stundenplan + Ja + gestern + Sie sind offline. Versuchen Sie, Wi-Fi oder mobile Daten zu aktivieren. + Netzwerkverbindung + (Kind) + (Elternteil) + Anwendungsentwickler + Liste der Szkolny-Entwickler + diff --git a/app/src/main/res/values-en/plurals.xml b/app/src/main/res/values-en/plurals.xml index 1bada092..a600f325 100644 --- a/app/src/main/res/values-en/plurals.xml +++ b/app/src/main/res/values-en/plurals.xml @@ -55,4 +55,13 @@ %1$s - %2$d unread %1$s - %2$d unread - \ No newline at end of file + + + %d contribution + %d contributions + + + %d translation + %d translations + + diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 0b0d8503..84e3c52b 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -1,20 +1,22 @@ + Semester 1 Semester 2 - - - From newest - By subject name - - From e-register By grade\'s value - + + From newest + By subject name + + + Event + Homework + January February @@ -29,38 +31,32 @@ November December - - - Event - Homework + + January + February + March + April + May + June + July + August + September + October + November + December - Szkolny.eu - - Light - Dark - Black / OLED - Chocolate - Indigo - Light yellow - Dark blue - Blue - Light blue - Dark purple - Purple - Light purple - Dark red - Red - Light red - Dark green - Amber - Light green - Abort Add Timetable changes + Absent teachers %s ago + There may be an app manager running on this device, which could cause issues with automatic synchronisation.\n\nIn order to prevent this issue, turn off battery optimization for Szkolny.eu.\n\nPress OK to go to system settings. + There was a problem with synchronization + Couldn\'t open settings Are you sure? + Summary - semester %d  + Summary - all year  Absences: Of which unexcused: Late: @@ -69,18 +65,24 @@ Releases: All subjects Summary - loading… - Summary - semester %d  - Summary - all year  Back Adjust the bell sync time. Format: ±H:MM:SS Incorrect format + break (%s) Calibration is impossible, because there are no lessons now. Try again, i.e. in the end of the lesson or break. Remember that you should run this even before planned bell time. + Choose the nearest bell to synchronize. \n\nCurrent calibration: %s - Click OK, when the lesson ends. The counter\'s time will be calibrated to the bell time.\n\nPlanned bell time is %s + Click the bell icon, when the bell rings. The counter\'s time will be calibrated to the bell time.\n\nPlanned bell time is %s\n\nThe bell time difference at the moment is %s + lesson %s (%s) Do you want to reset the calibration? - The bell is inexact by %s%s + The bell is inexact by %s + Time of the bell to synchronize Calibrate with the school bell + Calendar app not found Cancel + Move up + Move down + Upcoming events Go to grades Grades - last 7 days No grades to show @@ -102,21 +104,29 @@ Timetable for %s The lessons are over! You should never see this! Report an error! + Upcoming events + Recent grades + Lucky number + Timetable Download You have version %s, while %s is available. An update is available Choose a file Choose a profile Close + Compose + Compose + Configure Copied to clipboard Copy to clipboard + Synchronize If the app doesn\'t open at all, you can try to download the data again. Click the button, then Restart the app. Error details Message from developer It\'s not a bug. It\'s a feature! Please, report this error. Report the error - "Couldn't send a report: " + "Couldn\'t send a report: " Error report sent Restart application Synchronise @@ -124,8 +134,10 @@ today (%s) tomorrow (%s) You shouldn\'t really care about what you see here. - Expected semester %d average:\n%#.2f\n - Expected yearly average:\n%#.2f\n + These settings are intended for this app\'s developers, not for normal users.\n\nThey are not described in any way, so using them may lead to breaking some functions in the app, damaging your system, losing data or even installing a virus on the battery.\n\nBe careful and use them wisely. + Developer mode + Predicted semester %d average:\n%#.2f\n + Predicted yearly average:\n%#.2f\n Semester %d final grades average:\n%#.2f\n Yearly final grades average:\n%#.2f\n Semester %d proposed grades average:\n%#.2f\n @@ -133,6 +145,16 @@ Grade averages Averages of semester %d are not available Yearly average is not available + %s - %s (%s lessons - %s hours %s minutes) + No events this day + Error details + Added + Attachments + Content + Subject + Teacher + Team + Topic No events in the selected period. All day You cannot share this event unless you choose a group (class) of recipients. @@ -140,14 +162,23 @@ Select a lesson -- custom time -- Date + Select the time Date + next lesson %s + next %s (%s) + -- other day -- + today (%s) + tomorrow (%s) Lesson Select a lesson + More options To be able to share anything, you have to agree to register.\nDon\'t worry, the registration is automatic, so you don\'t have to specify any data.\n\nClick More to learn more about the processed data. You are not registered + No lessons this day No subject No teacher No team + No timetable is downloaded… This event was shared by someone else. You will remove it only on your device, but you\'ll never receive it again. This event was shared by you, so it\'ll be also removed on your classmates\' devices. Share to your class @@ -161,6 +192,9 @@ Teacher Team Select a team + Lesson/time + Select the time + Add an entry to the agenda Topic Specify a topic Type @@ -172,7 +206,7 @@ Description Grade history Grade ID - Grade is hidden - it was improved + The grade is improved by another one (no category) (no description) semester %d @@ -180,17 +214,36 @@ Value to the average weight %.2f Grades color + By grade\'s value + From e-register + From newest + By subject name Sort grades Details + Classroom + Lesson ID + Lesson number + Lesson shifted from %s + Lesson shifted to %s + Teacher + Team + Show + No events on this lesson. + You can add a new event manually, using Add button. + Choose which notifications should appear in your system and the app. + Show selected notifications + Profile removed successfully. Do you want to remove the selected event? Manual event Manual homework + Manual synchronization Profile Big font Opacity Theme Do nothing Done + Don\'t ask again Download %s (%s)? Downloading… Downloading file @@ -199,9 +252,78 @@ Create new Open existing Overwrite + Add a new profile Export app data + Add or remove students\' profiles + There are no more lessons for this subject. Download the timetable and try again. + Custom subject + Cancel + Close + Reporting errors… + Reporting errors + Synchronization interrupted + First login + Creating notifications + Synchronizing profile %s… + Thanks to it, Szkolny.eu can synchronize data with an e-journal. You can close it because it isn\'t doing anything right now. + Synchronization service + Syncing account details… + Syncing announcements… + Syncing attendance… + Syncing presence categories… + Syncing student behaviour… + Syncing behaviour grades… + Syncing calendar… + Syncing class information… + Syncing classrooms… + Syncing data… + Syncing descriptive grades… + Syncing dictionaries… + Syncing event categories… + Syncing calendar events… + Syncing exams + Syncing grade categories… + Syncing grade comments… + Syncing grades… + Syncing homework… + Syncing lessons… + Syncing the lucky number… + Syncing messages… + Syncing messages inbox… + Syncing messages outbox… + Syncing notice types… + Syncing notices… + Syncing point grades… + Syncing proposed grades… + Syncing parents\' meetings… + Setting up push notifications… + Syncing school info… + Syncing student info… + Syncing subjects… + Syncing teacher absence types… + Syncing teacher absences… + Syncing teachers… + Syncing class groups… + Syncing timetable… + Syncing unit info… + Logging in to Edudziennik… + Logging in to iDziennik… + Logging in to iDziennik… + Logging in to the API… + Logging in to LIBRUS® messages… + Logging in to LIBRUS® Rodzina… + Logging in to LIBRUS® Synergia… + Logging in to MobiDziennik… + Logging in to MobiDziennik… + Logging in to MobiDziennik… + Logging in to Template API… + Logging in to Template WEB… + Logging in to VULCAN® + Syncing shared events… + Creating notifications… Error Error details + Wrong module given: %d Report it to the application developer Your iDziennik password has expired. You have to change it in the desktop version of the website. The subject ID wasn\'t specified. An error occurred! @@ -212,22 +334,42 @@ School year was not found. Editing others\' events is not implemented yet. Student ID was not found. Probably the app was updated.\n\nDo a sync again or try again in 5 minutes. + Kod błędu: %d (on %s) Added: all day class event + %1$s by %2$s + %1$s by you + {cmd-share-variant} %1$s by %2$s + {cmd-share-variant} %1$s by you essay exam school trip information + Added %1$s by %2$s%3$s + Added %1$s by you%3$s + Adde %1$s%3$s + {cmd-share-variant} %1$s by %2$s%3$s + {cmd-share-variant} %1$s by you%3$s + Removing event… + Saving event… + Sharing event… + Removing event from the rest of the class… + Removing shared event… + Are you sure you want to mark this task as completed?\n\nIt won\'t show up on the main or homework pages, but will still be available in the agenda. + Mark as done other project parent-teacher meeting reading + Removing shared event… {cmd-share-variant} by %s you Event sharing + Sharing the event… short test homework + There are no more events in the calendar. Exit Frequently asked questions Did you find an answer to your question? If not, you can ask me directly. @@ -246,14 +388,28 @@ %s - proposed Starting points Starting points: semester %d + from %s %s (yearly) %s - yearly final %s (prop. yearly) %s - yearly proposed %spts, %spts - %s - %s%% + no average + average: %s + points: %s %spts + sum: %s + %s pts + annual: %2$s + Count the average if all weights are 0 + Allows to calculate the average of subjects in which all grades have a weight of 0 (are not counted to the average).\n\nIf such subjects shouldn\'t be counted to the average, uncheck the box next to this setting. + Exclude selected grades from the average + Separate the grades with a comma + Enter grades… + Hide corrected grades from the list + Custom \"minus\" value + Custom \"plus\" value + Grade configuration Add a grade Adding a grade Choose the weight of the grade @@ -270,41 +426,107 @@ other weight (resit) %s max %s pts - No subjects to show + No grades. + Semester %d Semester 1 Semester 2 semester %d: %s semester %d: %s%% semester %d: %spts + Semester %d Semester %d + Current settings could be affecting the average. If you think that it\'s incorrect, click Configure. + There is a custom \"minus\"/\"plus\" value set. If you think that it\'s incorrect, click Configure. + *grade averages are only illustrative and may vary, depending on school settings + *predicted average + *from final grades\nPredicted: %s + *from final grades + *from proposed grades\nPredicted: %s + *from proposed grades + The predicted grade for a given subject is calculated based on the current weighted average.\n\nThe grade is an integer that the teacher would have based on the average. The number is rounded up if the decimal part exceeds 75.\nFor example: 3.75 as well as 4.74 give a 4.\n\nThe predicted average of all subjects includes the final grades calculated in this way. + Calculating the average of all subjects + Too little data to calculate the average. + Average of regular grades + Average of point grades + Proposed grades average:\n%s + semester 1 + semester 2 + Grade stats + yearly value: %s weight %s not counted to avg end of year: %s yearly: %s%% yearly: %spts + Entire year: %s • %s Hello blank fragment Help Notification forwarding allows you to pair a PC web browser to receive notifications on your desktop. This includes new grades, events, homework etc.\n\nClick \"Notification forwarding\" to begin. - Registraton will run automatically on the first login.\n\nThere will be some data sent to the app server:\n- your school and class ID\n- your e-register username\n- your first and last name\n\nThe only data visible to others is your name (when sharing events). Any private data (like password, grades etc.) won\'t be sent anywhere. Learn more in the Privacy policy. + Registration will run automatically on the first login.\n\nThere will be some data sent to the app server:\n- your school and class ID\n- your e-register username\n- your first and last name\n\nThe only data visible to others is your name (when sharing events). Any private data (like password, grades etc.) won\'t be sent anywhere. Learn more in the Privacy policy. + Download again + Edit event + Go to timetable + Mark as done + Save to calendar + Add/remove cards + Swipe left to remove a card, hold to move. + %s • Your e-register number is %d + %s • Click to set your journal number. + The lucky number on %s is %d. + No info about the lucky number. + There is no lucky number today. + %d is today\'s lucky number. + %d is the lucky number for tomorrow. + Your number will be lucky on %s. + Today is your lucky number! + Tomorrow will be your lucky number! + Later: + no lessons + First: %s + Coming up: %s + Now: %s + %d lessons - %s to %s + Remaining lessons: %d to %s + There are no lessons + There are no lessons in the coming week. + The timetable was not downloaded + Sync + The timetable for week %s hasn\'t yet been downloaded. + There is no timetable + The timetable hasn\'t yet been made public by your school.\n\n\Contact your tutor for more information. + Today + Tomorrow (%1$s) Edit + There is no homework. + Current + Past I agree I disagree + in %s Incorrect format + Use system language New lesson Break Lesson cancelled Lesson change Shifted lesson Timetable change + There are no more lessons today! Loading… + This account doesn\'t have any students + You can\'t log in, because there is no student assigned to this account.\n\nAssing a student on e-journal page or login with an account with a student already assigned to it. Allow registration Log in Do you really want to cancel? Displayed profiles won\'t be saved. + Use the account details, which you use to login into the desktop version of Edudziennik. + Log in - Edudziennik Error: %s Account is not activated Token has expired. Generate a new token. Incorrect server name + Incorrect code + Incorrect code or PIN Incorrect e-mail Incorrect login Incorrect login or password @@ -313,9 +535,11 @@ Incorrect school name Incorrect school symbol Incorrect token + Incorrect token or PIN Incorrect username Enter server address no arguments specified + Enter the code Enter e-mail Enter login Enter password @@ -346,10 +570,13 @@ Help - iDziennik Progman Use the data which you got from your school. In case of any problems, use the button below the form. Log in - iDziennik Progman - In order to use the app you need a Librus account. You can create it on portal.librus.pl. Use the data you normally enter in the fields marked on the image. - Help - Librus - Log in using your Librus account data (created before on your e-mail address). You can\'t login using the data provided by your school. In case of any problems, use the button below the form. - Log in - Librus JST + LIBRUS® - login + In order to use the app you need a LIBRUS® Rodzina account. You can create it on portal.librus.pl. Use the data you normally enter in the fields marked on the image. + Help for LIBRUS® login + Log in with the token and PIN, which you can get from the "mobile apps" section of LIBRUS® Synergia. + Log in to LIBRUS® JST + Log in using your LIBRUS® Rodzina account data (created before on your e-mail address). You can\'t login using the data provided by your school. In case of any problems, use the button below the form. + Log in to LIBRUS® Synergia A migration error has occurred. It\'s already reported, which means I\'ll try to fix it.\n\nYou can continue using the app. In case of any problems try to remove the profile and create it again. The app got a huge update. If you encounter any problems, feel free to contact me using the Feedback option in the menu. Szkolny.eu has been updated @@ -363,6 +590,8 @@ Logging in… Choose the e-register which your school uses. Later you\'ll be able to add more accounts using different e-registers. Which e-register do you use? + (child) + (parent) Add a student You have to select at least one profile to save in the app. No profile selected @@ -370,17 +599,17 @@ It\'s almost ready You won\'t be able to use Event sharing and Notification forwarding. Turn off registration? - An error occurred during sync. Click the button on the bottom to report the error.\n\nProfiles were saved, so the app should work correctly. In case of any problems you can go to Feedback in the Drawer.\n + An error occurred during sync. Click the button on the bottom to report the error.\n\nProfiles were saved, so . In case of any problems you can go to Feedback in the Drawer.\n Sync error - %s]]>     + Syncing profile Syncing… Registering the device: - Login into desktop version of Vulcan e-register and select \"Dostęp mobilny\" option. Click \"Zarejestruj urządzenie mobilne\". You can type in the data or scan the QR code and type only the PIN. - Help - Vulcan UONET+ + Login into desktop version of VULCAN® e-register and select \"Dostęp mobilny\" option. Click \"Zarejestruj urządzenie mobilne\". You can type in the data or scan the QR code and type only the PIN. + Help - VULCAN® UONET+ Obtained data: Scan QR code Choose \"Dostęp mobilny\" on e-register website, register a new device and enter the data. In case of any problems, use the button below the form. - Log in - Vulcan UONET+ + Log in - VULCAN® UONET+ Add… Change view Generate a block timetable @@ -399,39 +628,92 @@ Today T W + Add event + Save own event or homework in the agenda Add a new student + Add or remove cards Agenda + Change Agenda view Notice board Attendance + Debugging + Help and FAQ + Save the timetable as an image + Generates timetable for the whole week Grades + End-of-year average calculation method + Grade averages + Show semester and end-of-year averages + Grades color + Grades settings Grade editing simulator + Sort grades Help Home page Homework + Lab Manage profiles Mark as read + Mark everything as read + Message + Compose Messages - Inbox - Sent Behaviour Notifications + Clear + Cleared notifications + Set your register number Settings Synchronise Synchronise all + Template Timetable + Timetable editor + Forwarding notifications Cannot download attachment An internal error occurred while downloading the attachment. A weak internet connection may be the case. + Download again + Are you sure you want to send the message to selected recipients? + Confirm sending the message + Add an attachment + Abort message + Save draft + Send + This recipient has already been selected + Select recipients + Check if the selected recipients are correct + Select recipients from the category %s you want to add to the message. + Add recipients + Send + Enter a subject with at least 3 characters + Subject + Enter the message + Write a message… + Write a message + To + Are you sure you want to delete the message? + This will move the message to the \"Deleted\" tab in the app. The changes will not affect the e-journal message (it will not be deleted ). Message downloading error Draft + You don\'t have any messages + Error getting the recipient list  %s, read: %s, %s]]>  %s, read: yes]]> -  %s]]>  %s, read: no]]> + Reply + %s at %s + Search + Found %d message + Message was sent + Deleted + Inbox + Sent More Try to turn on Wi-Fi or mobile data. You\'re offline Next No + There are no lessons today! No permissions No, thanks Not now @@ -440,29 +722,35 @@ %s, points: %s Praises: Summary - loading… - Summary - semester %d  - Summary - all year  + Summary - semester %d  + Summary - all year  Warnings: Notification Absence Excused absence - School announcement: %s + School announcement from %s: %s %1$s on lesson %2$s on day %3$s %1$s on day %3$s Late Excused late - Notification about data downloading - Downloading data - Notification about new data in the e-register + Failed to check for updates + Notification about data sync progress + Synchronisation + Notifications about new data in the e-register Notifications - Notification about new data in the e-register (no sound) - Notifications (quiet) + Notifications about new data in the e-register (no sound - during quiet hours) + Notifications (quiet hours) Notifications about new versions of the app App updates + Notifications about a problem that requires user interaction (e.g. Captcha verification). It is recommended to leave this category on. + Action required + Click to see all notifications + Day off Downloading update… %1$s on %2$s from %3$s - %1$s on %2$s unknown subject + %1$s on %2$s + Are you sure you want to apply these settings?\n\nYou won\'t see information about some data, so you may miss important messages or grades.\n\nThe settings will be applied to the currently selected profile. Cancel Szkolny.eu: error Error while getting data for profile %s @@ -473,12 +761,13 @@ New grade (%s) from %s Homework from %s for %s Homework for %s - Today %d is the lucky number. - The lucky number for %s is %d. - The lucky number for tomorrow is %d. - You are the Lucky number today! (%d) - %s you will have the Lucky number! (%d) - Tomorrow it\'s your Lucky number! (%d) + %s on %s - %s + Today %2$d is the lucky number. + The lucky number for %1$s is %2$d. + The lucky number for tomorrow is %2$d. + You are the lucky number today! (%2$d) + %1$s you will have the lucky number! (%2$d) + Tomorrow it\'s your lucky number! (%2$d) Unread message from %s: %s New notifications: %d No update available @@ -490,7 +779,7 @@ %s shared %s on %s - %s %s changed %s na %s - %s %s removed %s na %s - %s - Szkolny.eu: %s + New teacher absence for %s Attendance Profile archiving Error @@ -503,7 +792,10 @@ New homework New message New shared event + Shared homework + New teacher absence New notice + Removed shared event Server message Timetable change Lesson change @@ -511,11 +803,15 @@ Szkolny.eu: update Click to download version %s Update available + LIBRUS® Rodzina login: Captcha verification required. Click to continue logging into the e-journal. + The problem that prevents synchronization must be solved by the user. Click for more information. + Action required in the application No notifications. OK Open Opening %s No application opening this file type + Other Please wait Privacy policy Profile %s has been archived. Sync was disabled, because of the possibility of data loss on next data download.\n\nYou can still browse this profile\'s saved data.\n\nKeep in mind that some messages might not download correctly. @@ -528,11 +824,19 @@ Remove profile Are you sure? You are trying to remove profile %s. This means removing this profile\'s data (grades, timetables, events…) from the app.\n\nYou\'ll be able to restore most of the data by logging in again.\n\nDo you really want to remove profile %s? + Scan a QR code Never Later Rate now Show that you like Szkolny.eu - rate the app and make it even better! Refresh + Unregistering the user… + You won\'t be able to use some functions anymore, like Event sharing and Notification forwarding.\n\nThis feature may be enabled/disabled depending on the active profile. + Syncing shared events… + Registration is automatic if this option is enabled. It allows you to create and receive events shared with other students in your class. Thanks to this, you can add items not saved by the teacher to the journal.\n\nContinuing means reading and accepting the Privacy policy. + You need to turn on server registration, in order to share an event. This option lets you create and receive shared events in your class.\n\nIt will be turned on automatically by pressing OK.\n\nContinuing means reading and accepting the Privacy policy. + Sharing events + Szkolny.eu server registration Remove Removed Report @@ -545,10 +849,16 @@ Changelog Or better do not click… Click to throw an unexpected exception + Join our Discord community! + Discord server + Notice. This feature may not work on some devices or in some parts of the app. + Change app language + English + App language Open-source licenses Privacy policy - E-register - © Kuba Szczodrzyński && Kacper Ziubryniewicz\nSeptember 2018 - November 2019 + E-register + © Kuba Szczodrzyński && Kacper Ziubryniewicz\nSeptember 2018 - 2021 Click to check for updates Update Version @@ -559,6 +869,8 @@ Enter the name Change name Profile + Turn off certain types of notifications + Filter notifications Show notifications about this profile Notify about new data Remove profile picture @@ -601,6 +913,7 @@ You will receive shared events from other people in your class. Share exams in your class Enable Event sharing + Show teacher absences in Agenda Notice board Attendances Class free days @@ -635,7 +948,7 @@ Disabled Download data every %s Automatic sync - Sync & notifications + Sync & notifications Notify about app updates Show notifications on your PC Notification forwarding @@ -653,10 +966,15 @@ Customize Mini menu buttons Show a menu on the left Show Mini menu + Back button opens drawer + Jingle all the way + Jingle bells, Jingle bells + Brrrr + Bajo jajo, bajo jajo Pink System Theme - Appearance + Appearance Share Share… Sharing events… @@ -665,6 +983,9 @@ Homework Messages Timetable + An error occurred + By date + By subject All subjects Semester 1 Semester 2 @@ -672,7 +993,6 @@ Sure! Authorizing Creating notifications - %s… Getting account info Getting account list Getting certificate @@ -683,8 +1003,8 @@ Syncing Getting account info Getting notice board - Getting attendance types Getting attendance + Getting attendance types Getting behaviour grades categories Getting behaviour grades Getting agenda @@ -697,6 +1017,7 @@ Getting events Getting exams Getting grade types + Getting grade comments Getting grade details Getting grades Getting homework @@ -710,6 +1031,7 @@ Getting point grades Getting proposition grades Getting parent-teacher meetings + Getting school free days Getting school info Syncing shared events Getting subjects @@ -733,7 +1055,8 @@ Invalid school name or forbidden characters Server address is invalid. Make sure it\'s entered correctly and doesn\'t contain whitespaces. Invalid token specified. - LIBRUS account is not activated. Activate it using a link in the received e-mail. + LIBRUS® Rodzina account has lost connection with the LIBRUS® Synergia account. Login on portal.librus.pl or in the "LIBRUS®" mobile app and follow the instructions to fix the problem. + LIBRUS® account is not activated. Activate it using a link in the received e-mail. Login error Maintenance API address not found. Try to login again. @@ -746,6 +1069,7 @@ Student %s is not assigned to this register (login: %s).\n\nTry to log in again although this may also indicate a maintenance time. Error while saving data. Report the error. Failed to establish a secure connection. + The LIBRUS® Synergia account hasn\'t been activated by a parent or legal guardian.\n\nLog into portal.librus.pl and follow the instructions in order to activate it. Timeout Unknown error Syncing agenda… @@ -771,20 +1095,93 @@ Notifications Click on the menu header to change or add a student\'s profile. Here you\'ll also find a manual sync of all profiles. Modify profiles + Tutor + Librarian + Other + Parent + Parents\' council + Pedagogue / Psychologist + Principal + School Administrator + School parents\' council + Secretariat + Specialist + Student + SuperAdmin + Teacher + Browse category overmorrow the day before yesterday + Amber + Black / OLED + Blue + Chocolate + Dark + Dark blue + Dark green + Dark purple + Dark red + Indigo + Light + Light blue + Light green + Light purple + Light red + Light yellow + Purple + Red + Show timetable + No lessons this day: + Free day With changes for this week (%s to %s) Printable (no changes, less colors) Display the student\'s profile name With changes for the next week (%s to %s) No timetable changes + Printable (less colors) This may take few seconds… Generating timetable Range of the timetable + For selected week + Show profile name + Show names of teachers The timetable was saved in Szkolny.eu directory as an image file.\n\nYou can open or share it right away. Done + Lesson cancelled + Lesson change + Lesson change: instead of %s + Lesson shifted to other day + Lesson shifted from other day + Lesson shifted from %s %s + Lesson shifted from %s + "Lesson shifted to %s %s " + Lesson shifted to %s + Date + Select the date + Select the subject + Time + Select the time + %s (lesson %d) + No own lessons added for this day. + On each %s lesson + Includes a timetable for each week + By subject + Once + Repeating (no classroom) No lessons this day + No lessons this day + (no name) + Synchronize + Timetable for this week hasn\'t been synchronized yet + No timetable + for week %s + Contact your tutor in order to get the timetable. + Timetable is not public + No timetable + Choose date + Syncing timetable for the chosen week… + Today Sync all Debugging Feedback @@ -795,16 +1192,22 @@ Profile manager Switch the semester Changing profile… + today + tomorrow + Syncing… Unknown Update needed You have to update the app in order to use it. Click OK to download. You\'re trying to run an older version of the app which may break its data. Paired browsers No connection. + Paired %s No paired browsers. Pair a browser Do you want to remove this browser? + Token is invalid You can\'t do this + Unpair You have to enable registration in order to use Notification forwarding.\n\nSelect \"Allow registration\" in E-register Settings. What do you want to do? What is this? @@ -820,54 +1223,153 @@ Synchronise Use a bigger font No lessons on selected day. + No lessons for the next 7 days + Timetable isn\'t synchronized. Open the app and synchronize the timetable. The profile does not exist.\nAdd the widget again. + No lessons for the next 7 days. + Timetable isn\'t synchronized. Timetable Unified timetable Yes yesterday You\'re offline. Try enabling Wi-Fi or mobile data. Internet connection - Current - Past - There is no homework. - By date - By subject - LIBRUS account has lost connection with the Synergia account. Login on portal.librus.pl or in the Librus mobile app and follow the instructions to fix the problem. - Compose - Add a new profile - Add or remove students\' profiles - Wrong module given: %d Report it to the application developer - Add event - Save own event or homework in the agenda - Change Agenda view - Debugging - Help and FAQ - Save the timetable as an image - Generates timetable for the whole week - End-of-year average calculation method - Grade averages - Show semester and end-of-year averages - Grades color - Sort grades - Message - Set your register number - Add an attachment - Abort message - Save draft - Send - Absent teachers - Getting grade comments - Getting school free days - Show teacher absences in Agenda - Mark everything as read - App language - "English " - Change app language - Notice. This feature may not work on some devices or in some parts of the app. - Discord server - Join our Discord community! - Use system language - (child) - (parent) - Syncing... + In order to download the file, you have to grant file storage permission for the application.\n\nClick OK to grant the permission. + You denied the required permissions for the application.\n\nIn order to grant the permission, open the Permissions screen for Szkolny.eu in phone settings.\n\nClick OK to open app settings now. + Required permissions + App contributors + List of Szkolny.eu contributors + Contributors + Translators + Hide sticks from old + Official build + Google Play + Testing version + {cmd-information-outline} Recommended + {cmd-android-studio} Developer version + {cmd-alert-circle-outline} Testing version + \??? + See also + Source code + Git branch + .APK + Unofficial (.APK) + Commit hash + Unsaved changes + Last tag + Commits since last tag + Remote repository + Build details + Check code + Profile name + Logout + Synchronize this profile + Update + Not now + Update + EduDziennik + Log in - %s + Date + Teacher + By days + List + lesson %d + By type + Add new student + Lesson subject + Read more + App version + Version details + Build date + No API access + Time + Help with app development on GitHub + Distribution + Build verification in progress... + By months + Summary + Type + See more + Update available + Build details + Update app to the latest version - %s. + App update available + Close archive + Archived profile + Profile is archived + Holiday ;) + The end of the school year + Logout from other devices + Student profile not found. + Go to application website + Get help or support authors + Information about application version + No current profile + Loading e-registers list... + Log in using token + Provide mobile app token. + Attendance configuration + Show symbols and colors from e-register config + There are no absences here. + There are no grades in this semester + Attendance settings + What is your e-register at school? + Log in using login and password + Use a login in form of \"9874123u\" + Use token, symbol and PIN code + Register device on journal VULCAN® page + Use e-mail/username and password + Logging in to PPE... + Podlaska Platforma Edukacyjna + Log in using e-mail and password + Logging in to VULCAN® register... + Login via VULCAN® platform + Log in using e-mail + Attendance ID + Log in with the server name, login and password + Log in with the data that you provide on VULCAN® e-register website + Provide data, that you use on e-register website + Base type ID + Counted to the stats? + Choose which e-register your school uses. If you have several accounts in different e-registers, you will be able to add them later. + You must have a LIBRUS® Rodzina account + Only Oświata w Radomiu and Innowacyjny Tarnobrzeg + How do you log into the e-register? + Group consecutive days on the list + Visible when the list is expanded + Display attendance in months view + %.2f%% + Attendance during this period: %.2f%% + Log in child/parent account in app + Enter the e-mail address and password that you use to log in to the browser on the EduDziennik website. + Probably the school year for this student has not yet started (will start %s). Please try to sync later. + The school year ended on %s. Student data from the previous year will be moved to the archive for later review. + Trademarks featured in this application belong to their rightful owners and are used for informational purposes only. + You are viewing a student\'s data from the school year %d/%d. + Use data, that you enter on the e-register website + To be able to scan the QR code, you need to grant access to the camera.\n\nClick OK to grant permissions. + It\'s a pity, the opinions of others help me develop the application. + The selected login method is still being tested and may not work properly. If you have problems with the app, please choose the recommended login method. + You have an outdated version of the Szkolny.eu application. You need to update the app to continue to sync data. + You are using an old version of the Szkolny.eu application (%s). To use the app and ensure the best performance, please upgrade to %s. Change log: %s + You are viewing a student\'s data from the previous school year (%d /%d). Syncing and downloading of messages and some homework have been disabled. To open a student\'s profile for the current year, select Close Archive on the home page. + Log in to LIBRUS® Synergia on your computer, select the Mobile Applications tab, then enter the received Token and PIN below. + Enter the login received from the school with which you log into LIBRUS® Synergia (purple form).\n\nIt is recommended to log in with the LIBRUS® Family account (using e-mail) in the previous step. + Log in with your LIBRUS® Rodzina account, which works in the official LIBRUS® application and on the website portal.librus.pl, in the blue form. \n\nIf you do not have a LIBRUS® Rodzina account, you can create one at https://portal.librus.pl/rodzina/register. + If it takes too long, please check your internet connection and restart the application. + Select which image corresponds to the one you see when logging in to your log website. If your school doesn\'t use any of these city platforms, choose the first option. + You have an application build with unpublished changes. The build is in the repository:\n%1$s (%2$s)\nwhich is private or does not contain the latest changes.\n\nFor security reasons and compliance with the license, the use of the application has been blocked. + Log in to the VULCAN® log on your computer, select the Mobile Access tab, click the Register mobile device button. Enter the received Token, Symbol and PIN in the fields below. + Enter the data that you log in to the VULCAN® log website or the city platform. + You cannot modify this type of compilation of the Szkolny.eu application.\n\nTo make your own changes, please use the source code available on GitHub and see the README and license information.\n\nhttps://szkolny.eu/github/android + This build contains changes not committed to any revision. Save and publish all changes before \"release\".\n\nFor security reasons and for compliance with the license, the use of the application has been blocked. + You are using a \"debug\" build. This information will only be displayed once for the current device. + You are using an unofficial compilation of the Szkolny.eu application. We recommend that you use only the official versions of the application.\n\nLast changes in this version were made by:\n%3$s\nin the repository:\n%1$s (%2$s).\n\nThis window will not reappear. + The hash of the current commit was not found. Check Gradle configuration. + Child %s does not have a profile on this account in the current school year. Probably this profile has been deleted or the student no longer attends this class.\n\nTo go to the current profile, select a student from the list or log in to their account with the Add student button. + A reference to a remote repository was not found. Make sure you are using the official repository fork and verify your Gradle configuration. + "Enter the data you use to log in to the MobiDziennik website. As the server address, you can enter the address of the website where you have MobiDziennik. " + In order to be able to save the generated timetable, you must grant access rights to the device\'s memory.\n\nClick OK to grant permissions. + (Child) + (Parent) diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index dc9d55f7..55e0d3b5 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,12 +1,9 @@ - - - - \ No newline at end of file + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5d04d97c..3c17d618 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,7 +4,6 @@ #1976D2 #6EC6FF #4caf50 - #4CAF50 #ff101010 #fff3f3f3 @@ -13,7 +12,6 @@ #3e7f7f7f - #ffffffff #ffffffff diff --git a/app/src/main/res/values/errors.xml b/app/src/main/res/values/errors.xml index e6718985..827227c5 100644 --- a/app/src/main/res/values/errors.xml +++ b/app/src/main/res/values/errors.xml @@ -4,6 +4,9 @@ --> + ERROR_APP_CRASH + ERROR_MESSAGE_NOT_SENT + ERROR_REQUEST_FAILURE ERROR_REQUEST_HTTP_400 ERROR_REQUEST_HTTP_401 @@ -11,17 +14,52 @@ ERROR_REQUEST_HTTP_404 ERROR_REQUEST_HTTP_405 ERROR_REQUEST_HTTP_410 - ERROR_REQUEST_HTTP_500 + ERROR_REQUEST_HTTP_424 + ERROR_REQUEST_HTTP_500 + ERROR_REQUEST_HTTP_503 + ERROR_REQUEST_FAILURE_HOSTNAME_NOT_FOUND + ERROR_REQUEST_FAILURE_TIMEOUT + ERROR_REQUEST_FAILURE_NO_INTERNET + ERROR_REQUEST_FAILURE_SSL_ERROR ERROR_RESPONSE_EMPTY ERROR_LOGIN_DATA_MISSING ERROR_LOGIN_DATA_INVALID ERROR_PROFILE_MISSING + ERROR_PROFILE_ARCHIVED ERROR_INVALID_LOGIN_MODE ERROR_LOGIN_METHOD_NOT_SATISFIED ERROR_NOT_IMPLEMENTED + ERROR_FILE_DOWNLOAD ERROR_NO_STUDENTS_IN_ACCOUNT + ERROR_CAPTCHA_NEEDED + ERROR_CAPTCHA_LIBRUS_PORTAL + + ERROR_API_PDO_ERROR + ERROR_API_INVALID_CLIENT + ERROR_API_INVALID_ARGUMENT + ERROR_API_INVALID_SIGNATURE + ERROR_API_MISSING_SCOPES + ERROR_API_RESOURCE_NOT_FOUND + ERROR_API_INTERNAL_SERVER_ERROR + ERROR_API_PHP_E_ERROR + ERROR_API_PHP_E_WARNING + ERROR_API_PHP_E_PARSE + ERROR_API_PHP_E_NOTICE + ERROR_API_PHP_E_OTHER + ERROR_API_MAINTENANCE + ERROR_API_MISSING_ARGUMENT + ERROR_API_PAYLOAD_EMPTY + ERROR_API_INVALID_ACTION + ERROR_API_UPDATE_NOT_FOUND + ERROR_API_INVALID_DEVICEID_USERCODE + ERROR_API_INVALID_PAIRTOKEN + ERROR_API_INVALID_BROWSERID + ERROR_API_INVALID_DEVICEID + ERROR_API_INVALID_DEVICEID_BROWSERID + ERROR_API_HELP_CATEGORY_NOT_FOUND + CODE_INTERNAL_LIBRUS_ACCOUNT_410 CODE_INTERNAL_LIBRUS_SYNERGIA_EXPIRED ERROR_LOGIN_LIBRUS_API_CAPTCHA_NEEDED @@ -78,6 +116,14 @@ ERROR_LOGIN_LIBRUS_MESSAGES_INVALID_LOGIN ERROR_LOGIN_LIBRUS_PORTAL_INVALID_LOGIN ERROR_LIBRUS_API_MAINTENANCE + ERROR_LIBRUS_PORTAL_MAINTENANCE + ERROR_LIBRUS_API_NOTICEBOARD_PROBLEM + ERROR_LOGIN_LIBRUS_PORTAL_CSRF_EXPIRED + ERROR_LIBRUS_API_DEVICE_REGISTERED + ERROR_LIBRUS_MESSAGES_NOT_FOUND + ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST + ERROR_LIBRUS_MESSAGES_ATTACHMENT_NOT_FOUND + ERROR_LOGIN_LIBRUS_MESSAGES_TIMEOUT ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD @@ -92,40 +138,48 @@ ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID + ERROR_MOBIDZIENNIK_WEB_SERVER_PROBLEM ERROR_LOGIN_VULCAN_INVALID_SYMBOL ERROR_LOGIN_VULCAN_INVALID_TOKEN - ERROR_LOGIN_VULCAN_INVALID_PIN ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING ERROR_LOGIN_VULCAN_EXPIRED_TOKEN - ERROR_LOGIN_VULCAN_OTHER - ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN ERROR_LOGIN_VULCAN_NO_PUPILS - ERROR_VULCAN_API_MAINTENANCE - ERROR_VULCAN_API_BAD_REQUEST - ERROR_VULCAN_API_OTHER + ERROR_VULCAN_ATTACHMENT_DOWNLOAD + ERROR_VULCAN_WEB_DATA_MISSING + ERROR_VULCAN_WEB_429 + ERROR_VULCAN_WEB_OTHER + ERROR_VULCAN_WEB_NO_CERTIFICATE + ERROR_VULCAN_WEB_NO_REGISTER + ERROR_VULCAN_WEB_CERTIFICATE_EXPIRED + ERROR_VULCAN_WEB_LOGGED_OUT + ERROR_VULCAN_WEB_CERTIFICATE_POST_FAILED + ERROR_VULCAN_WEB_GRADUATE_ACCOUNT + ERROR_VULCAN_WEB_NO_SCHOOLS + ERROR_VULCAN_HEBE_OTHER + ERROR_VULCAN_HEBE_SIGNATURE_ERROR + ERROR_VULCAN_HEBE_INVALID_PAYLOAD + ERROR_VULCAN_HEBE_FIREBASE_ERROR + ERROR_VULCAN_HEBE_CERTIFICATE_GONE + ERROR_VULCAN_HEBE_SERVER_ERROR + ERROR_VULCAN_HEBE_ENTITY_NOT_FOUND + ERROR_VULCAN_HEBE_MISSING_SENDER_ENTRY + ERROR_VULCAN_API_DEPRECATED - ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN - ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME - ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED - ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE - ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR - ERROR_LOGIN_IDZIENNIK_WEB_OTHER - ERROR_LOGIN_IDZIENNIK_WEB_API_NO_ACCESS - ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION - ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH - ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER - ERROR_IDZIENNIK_WEB_ACCESS_DENIED - ERROR_IDZIENNIK_WEB_OTHER - ERROR_IDZIENNIK_WEB_MAINTENANCE - ERROR_IDZIENNIK_WEB_SERVER_ERROR - ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED - ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR - ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA - ERROR_IDZIENNIK_API_ACCESS_DENIED - ERROR_IDZIENNIK_API_OTHER + ERROR_LOGIN_EDUDZIENNIK_WEB_INVALID_LOGIN + ERROR_LOGIN_EDUDZIENNIK_WEB_OTHER + ERROR_LOGIN_EDUDZIENNIK_WEB_NO_SESSION_ID + ERROR_EDUDZIENNIK_WEB_LIMITED_ACCESS + ERROR_EDUDZIENNIK_WEB_SESSION_EXPIRED + ERROR_EDUDZIENNIK_WEB_TEAM_MISSING + + ERROR_LOGIN_PODLASIE_API_INVALID_TOKEN + ERROR_LOGIN_PODLASIE_API_DEVICE_LIMIT + ERROR_PODLASIE_API_NO_TOKEN + ERROR_PODLASIE_API_OTHER + ERROR_PODLASIE_API_DATA_MISSING ERROR_TEMPLATE_WEB_OTHER @@ -136,33 +190,75 @@ EXCEPTION_LIBRUS_API_REQUEST EXCEPTION_LIBRUS_SYNERGIA_REQUEST EXCEPTION_MOBIDZIENNIK_WEB_REQUEST - EXCEPTION_VULCAN_API_REQUEST - EXCEPTION_NOTIFY_AND_SYNC + EXCEPTION_MOBIDZIENNIK_WEB_FILE_REQUEST + EXCEPTION_LIBRUS_MESSAGES_FILE_REQUEST + EXCEPTION_NOTIFY EXCEPTION_LIBRUS_MESSAGES_REQUEST - EXCEPTION_IDZIENNIK_WEB_REQUEST - EXCEPTION_IDZIENNIK_WEB_API_REQUEST - EXCEPTION_IDZIENNIK_API_REQUEST + EXCEPTION_EDUDZIENNIK_WEB_REQUEST + EXCEPTION_EDUDZIENNIK_FILE_REQUEST + ERROR_ONEDRIVE_DOWNLOAD + EXCEPTION_VULCAN_WEB_LOGIN + EXCEPTION_VULCAN_WEB_REQUEST + EXCEPTION_PODLASIE_API_REQUEST LOGIN_NO_ARGUMENTS - Błąd odpowiedzi serwera - Błąd serwera: nieprawidłowe zapytanie + Aplikacja przestała działać + Nie udało się wysłać wiadomości: nowa wiadomość nie została odnaleziona na liście wiadomości wysłanych + + Błąd odpowiedzi serwera. Dziennik może być przeciążony lub mieć przerwę techniczną. + Błąd serwera: nieprawidłowe zapytanie. Dziennik może być przeciążony lub mieć przerwę techniczną. Błąd serwera: odmowa dostępu Błąd serwera: dostęp zabroniony Błąd serwera: plik nie znaleziony - Błąd serwera: nieprawidłowa metoda zapytania - Błąd serwera: odpowiedź niedostępna - Wewnętrzny błąd serwera - Brak odpowiedzi serwera - Dane logowania niekompletne + Błąd serwera: nieprawidłowa metoda zapytania. Dziennik może być przeciążony lub mieć przerwę techniczną. + Błąd serwera: odpowiedź niedostępna. Dziennik może być przeciążony lub mieć przerwę techniczną. + Błąd serwera: niespełnione zależności. Dziennik może być przeciążony lub mieć przerwę techniczną. + Wewnętrzny błąd serwera. Dziennik może być przeciążony lub mieć przerwę techniczną. + Dziennik jest tymczasowo niedostępny + Brak internetu: nie znaleziono adresu serwera + Przekroczono czas oczekiwania. Dziennik może być przeciążony lub mieć przerwę techniczną. + Brak internetu + Połączenie bezpieczne nie powiodło się. Sprawdź, czy masz ustawioną poprawnie datę i godzinę. + Brak odpowiedzi serwera. Dziennik może być przeciążony lub mieć przerwę techniczną. + Dane logowania niekompletne. Skontaktuj się z twórcą aplikacji. Nieprawidłowe dane logowania Profil nie został ustawiony - Nieprawidłowy sposób logowania - Nie można wywołać metody logowania + Profil jest archiwalny - synchronizacja profilu z poprzedniego roku szkolnego nie jest możliwa + Nieprawidłowy sposób logowania. Skontaktuj się z twórcą aplikacji. + Nie można wywołać metody logowania. Skontaktuj się z twórcą aplikacji. Nie zaimplementowano + Wystąpił błąd podczas pobierania pliku. Dziennik może być przeciążony lub mieć przerwę techniczną. Brak uczniów przypisanych do konta + Wymagane rozwiązanie zadania Captcha + LIBRUS®️: wymagane rozwiązanie zadania Captcha + + ERROR_API_PDO_ERROR + Nieprawidłowy ID klienta API + API: nieprawidłowy argument + Brak dostępu do API + Brak uprawnień do zasobu API + Nie znaleziono zasobu API + Błąd serwera API Szkolny.eu + ERROR_API_PHP_E_ERROR + ERROR_API_PHP_E_WARNING + ERROR_API_PHP_E_PARSE + ERROR_API_PHP_E_NOTICE + ERROR_API_PHP_E_OTHER + API Szkolny.eu: przerwa techniczna + API: brakujący argument + API: brak przesłanej zawartości + ERROR_API_INVALID_ACTION + API: nie znaleziono wybranej aktualizacji + ERROR_API_INVALID_DEVICEID_USERCODE + Nieprawidłowy token przeglądarki + ERROR_API_INVALID_BROWSERID + ERROR_API_INVALID_DEVICEID + ERROR_API_INVALID_DEVICEID_BROWSERID + ERROR_API_HELP_CATEGORY_NOT_FOUND + CODE_INTERNAL_LIBRUS_ACCOUNT_410 CODE_INTERNAL_LIBRUS_SYNERGIA_EXPIRED Wymagane wypełnienie CAPTCHA @@ -171,7 +267,7 @@ Wymagana akceptacja regulaminu Błąd zmiany hasła Wymagana zmiana hasła - Librus API: nieprawidłowe dane logowania + LIBRUS® API: nieprawidłowe dane logowania Inny błąd logowania do API Brak tokenu CSRF Konto LIBRUS nie zostało aktywowane @@ -195,12 +291,12 @@ Brak dostępu do Wiadomości Brak dostępu do Synergii Brak ID sesji Wiadomości - Odmowa dostępu do Portalu Librus - API Portalu Librus wyłączone - Konto Synergia zostało rozłączone - Inny błąd Portalu Librus - Nie znaleziono konta Synergia - Inny błąd logowania do Portalu Librus + Odmowa dostępu do Portalu LIBRUS® + API Portalu LIBRUS® wyłączone + Konto LIBRUS® utraciło połączenie z kontem Synergia. Zaloguj się na stronie portal.librus.pl lub w oficjalnej aplikacji LIBRUS® i postępuj zgodnie z instrukcją, aby naprawić konto. + Inny błąd Portalu LIBRUS® + Nie znaleziono konta Synergia. Zaloguj się na stronie portal.librus.pl, a następnie powiąż swoje konto Synergia do konta LIBRUS® Portal. + Inny błąd logowania do Portalu LIBRUS® ERROR_LOGIN_LIBRUS_PORTAL_CODE_EXPIRED ERROR_LOGIN_LIBRUS_PORTAL_CODE_REVOKED ERROR_LOGIN_LIBRUS_PORTAL_NO_CLIENT_ID @@ -208,81 +304,101 @@ ERROR_LOGIN_LIBRUS_PORTAL_NO_REFRESH ERROR_LOGIN_LIBRUS_PORTAL_NO_REDIRECT ERROR_LOGIN_LIBRUS_PORTAL_UNSUPPORTED_GRANT - ERROR_LOGIN_LIBRUS_PORTAL_INVALID_CLIENT_ID + Błędne ID klienta. Zgłoś błąd programiście oraz zaktualizuj aplikację. ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_INVALID ERROR_LOGIN_LIBRUS_PORTAL_REFRESH_REVOKED ERROR_LIBRUS_SYNERGIA_OTHER - Librus Synergia: przerwa techniczna - Librus Wiadomości: przerwa techniczna - ERROR_LIBRUS_MESSAGES_ERROR - ERROR_LIBRUS_MESSAGES_OTHER - Librus Wiadomości: nieprawidłowe dane logowania - Librus Portal: nieprawidłowe dane logowania - Librus API: przerwa techniczna + LIBRUS® Synergia: przerwa techniczna + LIBRUS® Wiadomości: przerwa techniczna + LIBRUS® Wiadomości: serwer zwrócił błąd. Prześlij zgłoszenie błędu. + LIBRUS® Wiadomości: serwer zwrócił nieznany błąd. Prześlij zgłoszenie błędu. + LIBRUS® Wiadomości: nieprawidłowe dane logowania + LIBRUS® Portal: nieprawidłowe dane logowania + LIBRUS® API: przerwa techniczna + LIBRUS® Portal: przerwa techniczna + Wystąpił problem z tablicą ogłoszeń + LIBRUS®: Sesja logowania wygasła. Zaloguj się ponownie. + Urządzenie jest już zarejestrowane + Nie znaleziono wiadomości. Mogła zostać usunięta. + Nieprawidłowe dane dostępu. Sprawdź poprawność wprowadzonych danych. + Nie znaleziono załącznika. Mógł zostać usunięty. + Logowanie LIBRUS® Wiadomości: ReCaptcha przekroczono czas oczekiwania. - ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN - ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD - ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_DEVICE - ERROR_LOGIN_MOBIDZIENNIK_WEB_ARCHIVED - ERROR_LOGIN_MOBIDZIENNIK_WEB_MAINTENANCE - ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_ADDRESS - ERROR_LOGIN_MOBIDZIENNIK_WEB_OTHER - ERROR_MOBIDZIENNIK_WEB_ACCESS_DENIED - ERROR_MOBIDZIENNIK_WEB_NO_SESSION_KEY - ERROR_MOBIDZIENNIK_WEB_NO_SESSION_VALUE - ERROR_MOBIDZIENNIK_WEB_NO_SERVER_ID - ERROR_MOBIDZIENNIK_WEB_INVALID_RESPONSE - ERROR_LOGIN_MOBIDZIENNIK_WEB_NO_SESSION_ID + Nieprawidłowy login lub hasło + Podano stare hasło + Nieprawidłowe urządzenie - zgłoś błąd programiście + Dziennik jest archiwalny - logowanie nie jest możliwe + Chwilowa przerwa techniczna MobiDziennika, lub inny problem z serwerem + Nieprawidłowy adres szkoły + Nieznany błąd logowania do MobiDziennika + MobiDziennik: brak dostępu + MobiDziennik: brak klucza sesji + MobiDziennik: brak wartości sesji + MobiDziennik: brak identyfikatora serwera + MobiDziennik: błąd odpowiedzi serwera + Brak identyfikatora sesji przy logowaniu + MobiDziennik: problemy z wydajnością serwerów. Spróbuj ponownie później. - ERROR_LOGIN_VULCAN_INVALID_SYMBOL - ERROR_LOGIN_VULCAN_INVALID_TOKEN - ERROR_LOGIN_VULCAN_INVALID_PIN - ERROR_LOGIN_VULCAN_INVALID_PIN_0_REMAINING - ERROR_LOGIN_VULCAN_INVALID_PIN_1_REMAINING - ERROR_LOGIN_VULCAN_INVALID_PIN_2_REMAINING - ERROR_LOGIN_VULCAN_EXPIRED_TOKEN - ERROR_LOGIN_VULCAN_OTHER - ERROR_LOGIN_VULCAN_ONLY_KINDERGARTEN - ERROR_LOGIN_VULCAN_NO_PUPILS - ERROR_VULCAN_API_MAINTENANCE - ERROR_VULCAN_API_BAD_REQUEST - ERROR_VULCAN_API_OTHER + Nieprawidłowy symbol + Nieprawidłowy token + Nieprawidłowy PIN. Wygeneruj nowy token. + Nieprawidłowy PIN: pozostała 1 próba + Nieprawidłowy PIN: pozostały 2 próby + Token wygasły, wygeneruj ponownie + Brak uczniów przypisanych do konta, bądź ukończyli oni już szkołę + VULCAN®: nie znaleziono adresu załącznika + VULCAN®: brakujące dane logowania FS. Usuń profil i zaloguj się ponownie. + VULCAN®: błąd logowania (429). Dziennik może być przeciążony. + VULCAN®: inny błąd logowania + VULCAN®: nie znaleziono zapisanego certyfikatu + VULCAN®: konto nie jest przypisane do żadnej szkoły + VULCAN®: certyfikat logowania wygasł + VULCAN®: wylogowano z konta + VULCAN®: nie udało się wysłać certyfikatu + VULCAN®: konto nie posiada już uczniów uczęszczających do szkoły + VULCAN®: nie znaleziono żadnej szkoły. Zgłoś błąd. + VULCAN®: nieznany błąd pobierania danych + Nieprawidłowy podpis zapytania. Sprawdź ustawienia daty i godziny w systemie. + VULCAN®: zapytanie zawiera niepoprawne dane + Błąd powiadomień push. Sprawdź połączenie z internetem. + VULCAN®: urządzenie usunięte. Zaloguj się ponownie do dziennika. + VULCAN®: błąd serwera. Dziennik może być przeciążony. + VULCAN®: nie znaleziono bytu + Błąd wysyłania wiadomości - brak informacji o nadawcy. + W związku z wygaszeniem aplikacji Dzienniczek+ przez firmę Vulcan, należy zalogować się ponownie.\n\nAby móc dalej korzystać z aplikacji Szkolny.eu, otwórz Ustawienia i wybierz opcję Dodaj nowego ucznia.\nNastępnie zaloguj się do dziennika Vulcan zgodnie z instrukcją.\n\nPrzepraszamy za niedogodności. - ERROR_LOGIN_IDZIENNIK_WEB_INVALID_LOGIN - ERROR_LOGIN_IDZIENNIK_WEB_INVALID_SCHOOL_NAME - ERROR_LOGIN_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED - ERROR_LOGIN_IDZIENNIK_WEB_MAINTENANCE - ERROR_LOGIN_IDZIENNIK_WEB_SERVER_ERROR - ERROR_LOGIN_IDZIENNIK_WEB_OTHER - ERROR_LOGIN_IDZIENNIK_WEB_API_NO_ACCESS - ERROR_LOGIN_IDZIENNIK_WEB_NO_SESSION - ERROR_LOGIN_IDZIENNIK_WEB_NO_AUTH - ERROR_LOGIN_IDZIENNIK_WEB_NO_BEARER - ERROR_IDZIENNIK_WEB_ACCESS_DENIED - ERROR_IDZIENNIK_WEB_OTHER - ERROR_IDZIENNIK_WEB_MAINTENANCE - ERROR_IDZIENNIK_WEB_SERVER_ERROR - ERROR_IDZIENNIK_WEB_PASSWORD_CHANGE_NEEDED - ERROR_LOGIN_IDZIENNIK_FIRST_NO_SCHOOL_YEAR - ERROR_IDZIENNIK_WEB_REQUEST_NO_DATA - ERROR_IDZIENNIK_API_ACCESS_DENIED - ERROR_IDZIENNIK_API_OTHER + Błędny email lub hasło + Inny błąd logowania + Brak ID sesji + Ograniczony dostęp do dziennika + Sesja wygasła + Nie można pobrać informacji o klasie i szkole + + Nieprawidłowy token + Przekroczono maksymalną liczbę urządzeń (5) + ERROR_PODLASIE_API_NO_TOKEN + ERROR_PODLASIE_API_OTHER + Brak danych. Zgłoś błąd programiście. ERROR_TEMPLATE_WEB_OTHER - EXCEPTION_API_TASK + Błąd synchronizacji. Upewnij się, że masz połączenie z internetem, a następnie zgłoś błąd. EXCEPTION_LOGIN_LIBRUS_API_TOKEN EXCEPTION_LOGIN_LIBRUS_PORTAL_TOKEN EXCEPTION_LIBRUS_PORTAL_SYNERGIA_TOKEN - EXCEPTION_LIBRUS_API_REQUEST + Zgłoś błąd: wyjątek w API LIBRUS® EXCEPTION_LIBRUS_SYNERGIA_REQUEST EXCEPTION_MOBIDZIENNIK_WEB_REQUEST - EXCEPTION_VULCAN_API_REQUEST - EXCEPTION_NOTIFY_AND_SYNC - EXCEPTION_LIBRUS_MESSAGES_REQUEST - EXCEPTION_IDZIENNIK_WEB_REQUEST - EXCEPTION_IDZIENNIK_WEB_API_REQUEST - EXCEPTION_IDZIENNIK_API_REQUEST + EXCEPTION_MOBIDZIENNIK_WEB_FILE_REQUEST + EXCEPTION_LIBRUS_MESSAGES_FILE_REQUEST + EXCEPTION_NOTIFY + Zgłoś błąd: pobieranie wiadomości LIBRUS® + Wystąpił błąd + Wystąpił błąd podczas pobierania pliku + Nie udało się pobrać pliku z OneDrive + EXCEPTION_VULCAN_WEB_LOGIN + EXCEPTION_VULCAN_WEB_REQUEST + Zgłoś błąd: wyjątek w API PPE Nie podano parametrów - \ No newline at end of file + diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..d75968c4 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,8 @@ + + + + + #0C92D6 + diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index 51e1215f..fd9da7a5 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -6,4 +6,5 @@ + \ No newline at end of file diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml index 8e7275b2..bcd87eca 100644 --- a/app/src/main/res/values/plurals.xml +++ b/app/src/main/res/values/plurals.xml @@ -81,4 +81,93 @@ %d błędów %d błędów - \ No newline at end of file + + + Szkolny.eu: %d nowe powiadomienie + Szkolny.eu: %d nowe powiadomienia + Szkolny.eu: %d nowych powiadomień + + + %d nowe powiadomienie + %d nowe powiadomienia + %d nowych powiadomień + + + + %d zmiana planu lekcji + %d zmiany planu lekcji + %d zmian planu lekcji + + + %d nowa ocena + %d nowe oceny + %d nowych ocen + + + %d nowe wydarzenie + %d nowe wydarzenia + %d nowych wydarzeń + + + %d nowe zadanie domowe + %d nowe zadania domowe + %d nowych zadań domowych + + + %d udostępnione wydarzenie + %d udostępnione wydarzenia + %d udostępnionych wydarzeń + + + %d udostępnione zadanie domowe + %d udostępnione zadania domowe + %d udostępnionych zadań domowych + + + %d nowa wiadomość + %d nowe wiadomości + %d nowych wiadomości + + + %d nowa uwaga + %d nowe uwagi + %d nowych uwag + + + %d nowy wpis frekwencji + %d nowe wpisy frekwencji + %d nowych wpisów frekwencji + + + szczęśliwy numerek + %d szczęśliwe numerki + %d szczęśliwych numerków + + + %d nowe ogłoszenie + %d nowe ogłoszenia + %d nowych ogłoszeń + + + %d inne powiadomienie + %d inne powiadomienia + %d innych powiadomień + + + + %d ocena + %d oceny + %d ocen + + + + %d commit + %d commity + %d commit\'ów + + + %d tłumaczenie + %d tłumaczenia + %d tłumaczeń + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7030806e..fd9a6935 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,20 +1,22 @@ + Semestr 1 Semestr 2 - - - Od najnowszych - Wg nazwy przedmiotu - - Wg e-dziennika Wg wartości oceny - + + Od najnowszych + Wg nazwy przedmiotu + + + Wydarzenie + Zadanie domowe + styczeń luty @@ -29,65 +31,80 @@ listopad grudzień - - - Wydarzenie - Zadanie domowe + + stycznia + lutego + marca + kwietnia + maja + czerwca + lipca + sierpnia + września + października + listopada + grudnia - Szkolny.eu - Szkolny.eu | %s - - Jasny - Ciemny - Czarny / OLED - Czekoladowy - Indygo - Jasny żółty - Ciemny niebieski - Niebieski - Jasny niebieski - Ciemny fioletowy - Fioletowy - Jasny fioletowy - Ciemny czerwony - Czerwony - Jasny czerwony - Ciemny zielony - Bursztynowy - Jasny zielony - Przerwij Dodaj Zmiany planu lekcji + Nieobecni nauczyciele %s temu + Na urządzeniu prawdopodobnie zainstalowany jest menedżer aplikacji, który może powodować problemy z synchronizacją automatyczną.\n\nNależy wyłączyć w ustawieniach telefonu optymalizację baterii dla aplikacji Szkolny.eu.\n\nKliknij OK, aby przejść do ustawień telefonu. + Wykryto problem z synchronizacją + Nie udało się otworzyć ustawień + Szkolny.eu + Szkolny.eu | %s Czy na pewno? nb u sp su + Grupuj kolejne dni na liście + Wyświetlaj obecność w widoku miesięcy + Konfiguracja frekwencji + Używaj symboli i kolorów wg dziennika + Widoczne po rozwinięciu listy + Nie ma tutaj żadnych nieobecności. + w + lekcja %d + %.2f%% + Obecność w tym okresie: %.2f%% ob zw + Podsumowanie - semestr %d  + Podsumowanie - cały rok  + Dni + Lista + Miesiące + Podsumowanie Nieobecności: W tym nieusprawiedliwione: Spóźnienia: - Brak nieobecności. + Nie masz żadnych nieobecności. Obecności: Zwolnienia: Wszystkie przedmioty Podsumowanie - ładowanie… - Podsumowanie - semestr %d  - Podsumowanie - cały rok  Wróć Dostosuj wartość przesunięcia dzwonka. Format: ±H:MM:SS Nieprawidłowy format + przerwa (%s) Synchronizacja jest niemożliwa, ponieważ teraz nie ma żadnych lekcji. Spróbuj jeszcze raz np. pod koniec lekcji albo przerwy. Pamiętaj, że powinieneś to uruchomić jeszcze przed planowanym czasem dzwonka. + Wybierz najbliższy dzwonek, abyś mógł go zsynchronizować z aplikacją. "\n\nAktualna kalibracja to %s" - Kliknij OK, kiedy lekcja się skończy. Licznik czasu zostanie zsynchronizowany z czasem dzwonka.\n\nCzas według planu to %s + Kliknij w ikonę dzwonka, kiedy dzwonek zadzwoni. Licznik czasu zostanie zsynchronizowany z czasem dzwonka.\n\nCzas według planu to %s\n\nAktualna różnica wynosi %s + lekcja %s (%s) Czy na pewno zresetować synchronizację? - Dzwonek jest niedokładny o %s%s + Dzwonek jest niedokładny o %s + Godzina dzwonka do synchronizacji Synchronizacja z dzwonkiem + Nie znaleziono aplikacji kalendarza Anuluj + Przesuń w dół + Przesuń w górę + Najbliższe wydarzenia Przejdź do ocen Oceny - ostatnie 7 dni Brak ocen do wyświetlenia @@ -111,15 +128,23 @@ Plan lekcji na %s Koniec lekcji! To nie powinno się nigdy pokazać! Zgłoś błąd! + Najbliższe wydarzenia + Ostatnie oceny + Szczęśliwy numerek + Plan lekcji Pobierz Posiadasz wersję %s, dostępna jest %s. Dostępna jest aktualizacja Wybierz plik Wybierz profil Zamknij + Napisz Napisz + %s%s + Konfiguruj Skopiowano do schowka Skopiuj do schowka + Synchronizuj Jeśli aplikacja nie chce się uruchomić, możesz spróbować ponownie pobrać dane. Kliknij na przycisk, a następnie Restartuj aplikację. Szczegóły błędu Wiadomość od dewelopera @@ -137,6 +162,8 @@ dzisiaj (%s) jutro (%s) Generalnie nie przejmuj się tym co tu widzisz. + Te ustawienia nie są przeznaczone dla zwykłych użytkowników, wyłącznie dla twórcy tej aplikacji.\n\nNie są nawet w żaden sposób opisane, nie wiadomo co robią, więc możesz nawet nie wiedzieć kiedy coś zepsujesz.\n\nWłączenie tych opcji może spowodować utratę danych w aplikacji, uszkodzenie twojego systemu lub nawet uruchomienie wirusa na baterii.\n\nLepiej uważaj. + Developer mode Przewidywana średnia na semestr %d:\n%#.2f\n Przewidywana średnia roczna:\n%#.2f\n Średnia ocen końcowych na semestr %d:\n%#.2f\n @@ -147,6 +174,17 @@ Średnie ocen Średnie ocen na semestr %d nie są dostępne Roczna średnia ocen nie jest dostępna + %s, %s + %s - %s (%s lekcji - %s godzin %s minut) + Brak wydarzeń tego dnia. + Szczegóły błędu + Dodano + Załączniki + Treść + Przedmiot + Nauczyciel + Grupa + Temat Brak wydarzeń w wybranym okresie. Cały dzień Aby udostępnić wydarzenie, musisz wybrać grupę (klasę) odbiorców. @@ -154,14 +192,24 @@ Wybierz lekcję -- inna godzina -- Data + Wybierz datę Termin + nast. lekcja %s + przyszły %s (%s) + -- inna data -- + %s (%s) + dzisiaj (%s) + jutro (%s) Lekcja Wybierz lekcję + Więcej opcji Aby móc coś udostępnić, musisz wyrazić zgodę na rejestrację.\nSpokojnie, rejestracja jest automatyczna, więc nie musisz podawać żadnych danych.\n\nKliknij Więcej, aby dowiedzieć się o rodzaju przetwarzanych danych. Nie jesteś zarejestrowany + Nie ma lekcji tego dnia Bez przedmiotu Bez nauczyciela Brak grupy + Nie pobrano planu lekcji… To wydarzenie zostało udostępnione przez inną osobę. Usuniesz je tylko u siebie, ale już nigdy nie otrzymasz go ponownie. To wydarzenie zostało przez ciebie udostępnione, dlatego zostanie usunięte również u wszystkich osób z grupy. Udostępnij klasie @@ -175,6 +223,9 @@ Nauczyciel Grupa Wybierz grupę + Lekcja/godzina + Wybierz godzinę + Dodaj wpis do terminarza Temat Podaj temat Rodzaj @@ -188,7 +239,7 @@ Opis Historia oceny ID oceny - Ocena jest ukryta - została poprawiona + Ocena została poprawiona (brak kategorii) (brak opisu) semestr %d @@ -196,17 +247,36 @@ Wartość do średniej waga %.2f Kolor ocen + Wg wartości oceny + Wg e-dziennika + Od najnowszych + Wg nazwy przedmiotu Sortuj oceny Szczegóły + Sala lekcyjna + ID lekcji + Nr lekcji + Lekcja przeniesiona z %s + Lekcja przeniesiona na %s + Nauczyciel + Grupa + Przejdź + Brak wydarzeń na tej lekcji. + Możesz wpisać wydarzenie ręcznie, używając przycisku Dodaj. + Zaznacz, które powiadomienia mają być pokazywane w systemie oraz w aplikacji. + Pokazuj wybrane powiadomienia + Profil został usunięty. Na pewno usunąć wybrane wydarzenie? Własne wydarzenie Własne zadanie domowe + Synchronizacja ręczna Profil Duża czcionka Przezroczystość Motyw Nic nie rób Gotowe + Nie pytaj ponownie Pobrać plik %s (%s)? Pobieram… Pobieranie pliku @@ -218,9 +288,76 @@ Zaloguj się na nowy profil Eksportuj dane aplikacji Dodaj lub usuń profile uczniów + Nie ma więcej lekcji tego przedmiotu. Pobierz plan lekcji i spróbuj ponownie. + Własny przedmiot + Anuluj + Zamknij + Zgłaszanie błędów… + Zgłaszanie błędów + Synchronizacja przerwana + Pierwsze logowanie + Tworzenie powiadomień + Trwa synchronizacja profilu %s… + Dzięki niej, aplikacja Szkolny.eu może synchronizować dane z e-dziennikiem. Możesz ją zamknąć, ponieważ w tej chwili nic nie robi. + Usługa synchronizacji + Pobieranie szczegółów konta… + Pobieranie ogłoszeń szkolnych… + Pobieranie frekwencji ucznia… + Pobieranie kategorii obecności… + Pobieranie uwag ucznia… + Pobieranie ocen z zachowania… + Pobieranie kalendarza… + Pobieranie informacji o klasie… + Pobieranie listy sal lekcyjnych… + Pobieranie danych… + Pobieranie ocen opisowych… + Pobieranie słowników… + Pobieranie kategorii wydarzeń… + Pobieranie wydarzeń kalendarza… + Pobieranie listy sprawdzianów… + Pobieranie kategorii ocen… + Pobieranie komentarzy ocen… + Pobieranie ocen ucznia… + Pobieranie zadań domowych… + Pobieranie listy lekcji… + Pobieranie szczęśliwego numerka… + Pobieranie wiadomości… + Pobieranie wiadomości odebranych… + Pobieranie wiadomości wysłanych… + Pobieranie kategorii uwag… + Pobieranie uwag… + Pobieranie ocen punktowych… + Pobieranie ocen proponowanych… + Pobieranie zebrań z rodzicami… + Konfigurowanie natychmiastowych powiadomień… + Pobieranie informacji o szkole… + Pobieranie informacji o uczniu… + Pobieranie listy przedmiotów… + Pobieranie rodzajów nieobecności nauczycieli… + Pobieranie nieobecności nauczycieli… + Pobieranie listy nauczycieli… + Pobieranie grup klasowych… + Pobieranie planu lekcji… + Pobieranie informacji o jednostce… + Logowanie do Edudziennika… + Logowanie do iDziennika… + Logowanie do iDziennika… + Logowanie do API + Logowanie do wiadomości LIBRUS® + Logowanie do Portalu LIBRUS® Rodzina + Logowanie do LIBRUS® Synergia + Logowanie do API MobiDziennika… + Logowanie do API MobiDziennika… + Logowanie do MobiDziennika… + Logowanie do Template API… + Logowanie do Template WEB… + Logowanie do VULCAN® API… + Synchronizowanie udostępnionych wydarzeń… + Tworzenie powiadomień… … Błąd Szczegóły błędu + Podano nieprawidłowy moduł: %d Zgłoś błąd programiście Twoje hasło do iDziennika wygasło, co oznacza że musisz je zmienić w wersji komputerowej serwisu. Identyfikator przedmiotu nie został podany. Wystąpił błąd! @@ -231,22 +368,43 @@ Nie znaleziono roku szkolnego. Prawdopodobnie uczeń nie jest przypisany do dziennika w tym semestrze. Opcja edycji wydarzeń innych uczniów nie została jeszcze zaimplementowana. Nie znaleziono ID ucznia. Prawdopodobnie aplikacja została zaktualizowana.\n\nWykonaj ponownie synchronizację lub spróbuj ponownie za 5 minut. + Kod błędu: %d (w %s) Dodano: cały dzień wydarzenie klasowe + %1$s przez %2$s + %1$s przez Ciebie + %1$s + {cmd-share-variant} %1$s przez %2$s + {cmd-share-variant} %1$s przez Ciebie wypracowanie sprawdzian wycieczka informacja + Dodano %1$s przez %2$s%3$s + Dodano %1$s przez Ciebie%3$s + Dodano %1$s%3$s + {cmd-share-variant} %1$s przez %2$s%3$s + {cmd-share-variant} %1$s przez Ciebie%3$s + Usuwam wydarzenie… + Zapisuję wydarzenie… + Udostępniam wydarzenie… + Usuwam wydarzenie u reszty klasy… + Usuwam udostępnione wydarzenie… + Czy chcesz oznaczyć to zadanie jako wykonane?\n\nNie będzie ono się wyświetlać na stronie głównej oraz w aktualnych zadaniach domowych. Będzie wciąż dostępne w Terminarzu. + Oznacz jako wykonane inny projekt zebranie z rodzicami lektura + Usuwanie udostępnionego wydarzenia… {cmd-share-variant} przez %s ciebie Udostępnianie wydarzeń + Udostępnianie wydarzenia… kartkówka zadanie domowe + Nie ma więcej wydarzeń w kalendarzu. Wyjdź Często zadawane pytania Czy znalazłeś odpowiedź na Twoje pytanie? Jeśli nie, możesz zadać pytanie bezpośrednio do mnie. @@ -265,6 +423,7 @@ %s - proponowana Punkty startowe Punkty startowe: semestr %d + z %s %s (roczna) %s - roczna %s (prop. roczna) @@ -272,9 +431,26 @@ %s, %s %s%%, %s%% %spkt, %spkt - %s - %s%% + brak średniej + średnia: %s + punkty: %s + sem. %1$d: %2$s + %s + %s%% %spkt + suma: %s + %3$s%% + %s pkt + roczna: %2$s + Licz średnią jeśli wszystkie wagi to 0 + Pozwala na liczenie średniej arytmetycznej z przedmiotów, w których wszystkie wystawione oceny mają wagę 0 (nie są liczone do średniej).\n\nJeśli taki przedmiot celowo nie powinien być liczony, odznacz okienko przy tym ustawieniu. + Wyklucz wybrane oceny ze średniej + Oceny oddziel przecinkiem + Podaj oceny… + Ukrywaj oceny poprawione z listy + Własna wartość minusa + Własna wartość plusa + Konfiguracja ocen Dodaj ocenę Dodawanie oceny Podaj wagę oceny @@ -289,45 +465,117 @@ Twoja średnia na koniec roku: waga %s inna waga + Nie ma ocen w tym semestrze. (poprawa) %s max %s pkt - Brak przedmiotów do wyświetlenia + Brak ocen w dzienniku. + Semestr %d Semestr 1 Semestr 2 semestr %d: %s semestr %d: %s%% semestr %d: %spkt + Semestr %d Semestr %d + Aktualne ustawienia ocen mogą wpływać na średnią. Jeśli uważasz, że się ona nie zgadza, kliknij Konfiguruj. + Została ustawiona własna wartość plusa/minusa. Jeśli uważasz, że się ona nie zgadza, kliknij Konfiguruj. + *średnie ocen są poglądowe i mogą się różnić, w zależności od ustawień szkoły + *przewidywana średnia + *z ocen końcowych\nPrzewidywana: %s + *z ocen końcowych + *z ocen proponowanych\nPrzewidywana: %s + *z ocen proponowanych + Ocena przewidywana z danego przedmiotu jest obliczana na podstawie aktualnej średniej ważonej.\n\nOcena jest liczbą całkowitą, jaką wystawiłby nauczyciel bazując na średniej. Liczba zaokrąglona jest w górę jeśli część po przecinku przekroczy ,75.\nPrzykładowo: średnie 3,75 jak również 4,74 dają w wyniku ocenę dobrą (4).\n\nŚrednia przewidywana ze wszystkich przedmiotów obejmuje obliczone w ten sposób oceny końcowe. + Obliczanie średniej wszystkich przedmiotów + Zbyt mało danych do wyliczenia średniej. + Średnia zwykłych ocen + Średnia przedmiotów punktowych + Śr. ocen proponowanych:\n%s + semestr 1 + semestr 2 + Statystyka ocen + całoroczna wartość: %s waga %s nie liczona do śr. koniec roku: %s koniec roku: %s%% koniec roku: %spkt + Cały rok: %s • %s Witaj pusty fragmencie Pomoc Przekazywanie powiadomień umożliwia sparowanie z przeglądarką internetową w celu wysyłania wszystkich powiadomień z aplikacji na komputer. Można do nich zaliczyć np. nowe oceny, wydarzenia, zadania domowe itp.\n\nKliknij \"Przekazywanie powiadomień\", aby rozpocząć. Rejestracja odbędzie się automatycznie przy pierwszym logowaniu do e-dziennika.\n\nDo poprawnego działania funkcji zostaną przesłane:\n- Twój identyfikator szkoły i klasy\n- Twoja nazwa użytkownika do e-dziennika\n- Twoje imię i nazwisko\n\nJedyne dane widoczne dla innych osób z twojej klasy to Imię i Nazwisko podczas udostępniania wydarzeń. Nie zostaną wysłane żadne prywatne dane, takie jak hasła, oceny itp. Dowiedz się więcej w Polityce Prywatności. + Pobierz ponownie + Edytuj wydarzenie + Idź do planu lekcji + Oznacz jako wykonane + Zapisz do kalendarza + Dodaj/usuń karty + Możesz usunąć karty przesuwając w lewo lub zmienić ich kolejność, przytrzymując na kartę. + %s • Numer w dzienniku to %d + %s • Kliknij, aby ustawić swój numerek. + Dnia %s szczęśliwy numerek to %d. + Brak informacji o szczęśliwym numerku. + Nie ma dzisiaj szczęśliwego numerka. + %d to dzisiejszy szczęśliwy numerek. + %d to szczęśliwy numerek na jutro. + Dnia %s Twój numerek jest szczęśliwy. + Dzisiaj to Ty masz szczęśliwy numerek! + Jutro to Ty masz szczęśliwy numerek! + %1$s, %2$s + %1$s, %2$s + Później: + brak lekcji + Pierwsza: %s + Za chwilę: %s + Teraz: %s + %d lekcji - %s do %s + Pozostało lekcji: %d - do %s + Nie ma żadnych lekcji + Przez następne 7 dni nie ma żadnych lekcji. + Nie pobrano planu lekcji + Pobierz + Plan lekcji na tydzień %s nie został jeszcze pobrany. + Brak planu lekcji + Plan lekcji nie został opublikowany przez szkołę.\n\nSkontaktuj się z wychowawcą. + Dzisiaj + Jutro (%1$s) Edytuj + Brak zadań domowych. %s, %s + Aktualne + Minione %s %s Zgadzam się Nie zgadzam się + za %s Nieprawidłowy format + English + Deutsch + Polski + Według systemu Nowa lekcja Przerwa Lekcja odwołana Zastępstwo Lekcja przeniesiona Zmiana planu + Nie ma dzisiaj więcej lekcji! Ładowanie… + To konto nie ma żadnych uczniów + Do tego konta nie ma przypisanego żadnego ucznia, dlatego zalogowanie nie jest możliwe.\n\nPrzypisz ucznia na stronie swojego e-dziennika lub zaloguj się kontem, które ma przypisanego ucznia. Zezwól na rejestrację Zaloguj Czy na pewno chcesz anulować logowanie w aplikacji? Wyświetlane profile nie zostaną zapisane. + Użyj danych, którymi logujesz się do wersji komputerowej Edudziennika. + Zaloguj się - Edudziennik Błąd: %s Konto nie zostało aktywowane Token wygasł. Wygeneruj ponownie Nieprawidłowa nazwa serwera + Nieprawidłowy kod + Nieprawidłowy kod lub PIN Nieprawidłowy e-mail Nieprawidłowy login Nieprawidłowy login lub hasło @@ -336,9 +584,11 @@ Nieprawidłowa nazwa szkoły Nieprawidłowy symbol szkoły Nieprawidłowy token + Nieprawidłowy token lub PIN Nieprawidłowa nazwa użytkownika Podaj adres serwera nie podano argumentów + Podaj kod Podaj e-mail Podaj login Podaj hasło @@ -369,11 +619,13 @@ Pomoc - iDziennik Progman Zaloguj się danymi, które otrzymałeś od swojej szkoły. W razie problemów skorzystaj z przycisku pod formularzem. Zaloguj się - iDziennik Progman - Aby korzystać z aplikacji musisz posiadać konto Librus. Możesz je założyć na stronie portal.librus.pl. Użyj danych, które wpisujesz w miejsca zaznaczone na obrazku. - Pomoc - Librus - Zaloguj się danymi swojego konta Librus (założonego wcześniej na swój adres e-mail). Nie należy logować się danymi otrzymanymi ze swojej szkoły. W razie problemów skorzystaj z przycisku pod formularzem. - Zaloguj się - Librus - Zaloguj się - Librus JST + LIBRUS® - logowanie + Aby korzystać z aplikacji musisz posiadać konto LIBRUS® Rodzina. Możesz je założyć na stronie portal.librus.pl. Użyj danych, które wpisujesz w miejsca zaznaczone na obrazku. + Pomoc do logowania LIBRUS® + Zaloguj się tokenem i kodem PIN, który można wygenerować po zalogowanu się do LIBRUS® Synergia w zakładce Aplikacje mobilne. + Zaloguj się do LIBRUS® JST + Zaloguj się danymi swojego konta LIBRUS® Rodzina (założonego wcześniej na swój adres e-mail). Nie należy logować się danymi otrzymanymi ze swojej szkoły. W razie problemów skorzystaj z przycisku pod formularzem. + Zaloguj się do LIBRUS® Synergia Wystąpił błąd w migracji danych. Został on już zgłoszony, co oznacza, że postaram się go naprawić.\n\nMożesz zacząć korzystać z aplikacji, jednak w przypadku jakichś błędów spróbuj usunąć profil i zalogować się ponownie. Aplikacja otrzymała dużą aktualizację. Jeżeli będą występować jakieś problemy w działaniu, możesz się ze mną skontaktować używając pozycji Pomoc i opinie w menu. Szkolny.eu został zaktualizowany @@ -387,6 +639,8 @@ Loguję… Wybierz z jakiego e-dziennika korzysta Twoja szkoła. W późniejszych etapach będziesz mógł dodać kilka kont z różnych e-dzienników. Z jakiego e-dziennika korzystasz? + (uczeń) + (rodzic) Dodaj ucznia Musisz wybrać przynajmniej jeden profil, który chcesz zapisać w aplikacji. Nie wybrałeś żadnego profilu @@ -396,16 +650,15 @@ Na pewno wyłączyć rejestrację? Podczas synchronizacji wystąpił błąd. Kliknij przycisk na dole strony, aby go zgłosić.\n\nProfile zostały zapisane, tak więc aplikacja powinna działać poprawnie. W razie co, możesz skorzystać z opcji Pomoc i opinie w menu.\n Błąd synchronizacji - %s]]> - %s… + Synchronizuję profil Synchronizacja… Rejestracja urządzenia: - Zaloguj się w wersji komputerowej dziennika Vulcan, a następnie wybierz opcję Dostęp mobilny. Kliknij Zarejestruj urządzenie mobilne. Możesz wpisać otrzymane dane lub zeskanować kod QR i wpisać sam kod PIN. - Pomoc - Vulcan UONET+ + Zaloguj się w wersji komputerowej dziennika VULCAN®, a następnie wybierz opcję Dostęp mobilny. Kliknij Zarejestruj urządzenie mobilne. Możesz wpisać otrzymane dane lub zeskanować kod QR i wpisać sam kod PIN. + Pomoc - VULCAN® UONET+ Otrzymane dane: Skanuj kod QR Wybierz opcję Dostęp mobilny na stronie e-dziennika, zarejestruj nowe urządzenie i wpisz otrzymane dane. W razie problemów skorzystaj z przycisku pod formularzem. - Zaloguj się - Vulcan UONET+ + Zaloguj się - VULCAN® UONET+ Dodaj… Zmień widok Generuj blokowy plan lekcji @@ -424,57 +677,98 @@ Dzisiaj W Ś + Dodaj wydarzenie + Zapisz własne wydarzenie lub zadanie domowe w Terminarzu Dodaj nowego ucznia + Dodaj lub usuń karty Terminarz + Zmień widok Terminarza Tablica ogłoszeń Frekwencja + Ustawienia frekwencji + Debugowanie + Pomoc i opinie Zapisz plan lekcji jako obraz Generuje plan lekcji na cały tydzień Oceny + Sposób obliczania średniej końcoworocznej + Średnie ocen + Pokaż średnie semestralne i końcoworoczne + Kolor wyświetlanych ocen + Ustawienia ocen Symulator edycji ocen + Sortuj oceny Pomoc Strona główna Zadania domowe + Laboratorium Zarządzaj profilami Oznacz jako przeczytane Oznacz wszystko jako przeczytane + Wiadomość + Napisz wiadomość Wiadomości - Odebrane - Wysłane Zachowanie Powiadomienia + Usuń wszystkie + Wyczyszczono powiadomienia Ustaw numer w dzienniku Ustawienia Synchronizuj Synchronizuj wszystkie + Szablon Plan lekcji + Edytor planu lekcji + Przekazywanie powiadomień Nie można pobrać załącznika Wystąpił błąd wewnętrzny pobierania załącznika. Może to być spowodowane słabym połączeniem internetowym. + Pobierz ponownie %s (%.2fMB) %s (%s) %s + Czy na pewno chcesz wysłać wiadomość do wybranych odbiorców? + Potwierdź wysłanie wiadomości Dodaj załącznik Odrzuć wiadomość Zapisz wersję roboczą Wyślij + Ten odbiorca został już wybrany + Wybierz odbiorców + Sprawdź poprawność wybranych odbiorców Wybierz odbiorców z kategorii %s, których chcesz dodać do wiadomości. Dodaj odbiorców + Wyślij + Wpisz temat o długości co najmniej 3 znaków Temat + Wpisz treść wiadomości + Napisz wiadomość… Napisz wiadomość Do %s, %s + Czy chcesz usunąć wiadomość? + Spowoduje to przeniesienie wiadomości do zakładki \"Usunięte\" w aplikacji. Zmiany nie wpłyną na wiadomość w e-dzienniku (nie zostanie ona tam usunięta). Błąd pobierania wiadomości Wersja robocza + Nie masz żadnych wiadomości. Błąd pobierania listy odbiorców  %s, przeczytano: %s, %s]]>  %s, przeczytano: tak]]> -  %s]]> +  %s]]>  %s, przeczytano: nie]]> + Odpowiedz + %s o %s + Szukaj + Znaleziono %d wiadomości + Wiadomość została wysłana + Usunięte + Odebrane + Wysłane Więcej Spróbuj włączyć Wi-Fi lub dane pakietowe. Jesteś offline Dalej Nie + Nie ma dzisiaj żadnych lekcji! Brak uprawnień Nie, dzięki Nie teraz @@ -483,29 +777,35 @@ %s, punktów: %s Pochwały: Podsumowanie - ładowanie… - Podsumowanie - semestr %d  - Podsumowanie - cały rok  + Podsumowanie - semestr %d  + Podsumowanie - cały rok  Uwagi: Powiadomienie Nieobecność Nieobecność usprawiedliwiona - Ogłoszenie szkolne: %s + Ogłoszenie szkolne od %s: %s %1$s na lekcji %2$s z dnia %3$s %1$s z dnia %3$s Spóźnienie Spóźnienie usprawiedliwione + Nie udało się sprawdzić aktualizacji Powiadomienie o pobieraniu danych dla e-dziennika Pobieranie danych Powiadomienie o nowej zawartości w e-dzienniku Powiadomienia - Powiadomienie o nowej zawartości w e-dzienniku (bez dźwięku) - Powiadomienia (cisza) + Powiadomienie o nowej zawartości w e-dzienniku (bez dźwięku - podczas ciszy nocnej) + Powiadomienia (cisza nocna) Powiadomienia o nowych wersjach aplikacji Aktualizacje + Powiadomienia o problemie, który wymaga działania użytkownika (np. weryfikacja Captcha). Zalecane jest pozostawienie tej kategorii włączonej. + Wymagane działanie + Kliknij, aby zobaczyć wszystkie powiadomienia + Dzień wolny Pobieranie aktualizacji… %1$s dnia %2$s z %3$s - %1$s dnia %2$s nieznanego przedmiotu + %1$s dnia %2$s + Czy na pewno chcesz zastosować te ustawienia?\n\nNie będziesz widział informacji o niektórych danych, przez co możesz przeoczyć ważne komunikaty, wiadomości lub oceny.\n\nUstawienia zostaną zastosowane dla aktualnie otwartego profilu. Przerwij Szkolny.eu: błąd Błąd podczas pobierania danych dla profilu %s @@ -516,13 +816,13 @@ Nowa ocena (%s) z %s Zadanie domowe z %1$s na %2$s Zadanie domowe na %2$s - %s %s - %s - Dzisiaj %d to szczęśliwy numerek. - Szczęsliwy numerek na %s to %d. - Szczęsliwy numerek na jutro to %d. - Dzisiaj to Ty masz szczęśliwy numerek! (%d) - %s to Ty będziesz miał szczęśliwy numerek! (%d) - Jutro to Ty masz szczęśliwy numerek! (%d) + %s dnia %s - %s + Dzisiaj %2$d to szczęśliwy numerek. + Szczęsliwy numerek na %1$s to %2$d. + Szczęsliwy numerek na jutro to %2$d. + Dzisiaj to Ty masz szczęśliwy numerek! (%2$d) + %1$s to Ty będziesz miał szczęśliwy numerek! (%2$d) + Jutro to Ty masz szczęśliwy numerek! (%2$d) Nieodebrana wiadomość od %s: %s Nowe powiadomienia: %d Brak dostępnej aktualizacji @@ -534,7 +834,8 @@ %s udostępnił %s na %s: %s %s zmienił %s na %s: %s %s usunął %s na %s: %s - Szkolny.eu: %s + Nowa nieobecność nauczyciela dla %s + Szkolny.eu: %s Wpis frekwencji Archiwizacja profilu Błąd @@ -547,7 +848,10 @@ Nowe zadanie domowe Nowa wiadomość Udostępniono wydarzenie - Ocena ucznia + Udostępniono zadanie domowe + Nowa nieobecność nauczyciela + Wpis zachowania + Usunięto wydarzenie Wiadomość z serwera Zmiana planu zajęć Zmiana lekcji @@ -555,11 +859,18 @@ Szkolny.eu: aktualizacja Kliknij, aby pobrać wersję %s Dostępna aktualizacja + Logowanie do LIBRUS® Rodzina: wymagane rozwiązanie zadania Captcha. Kliknij, aby kontynuować logowanie do dziennika. + Problem, który uniemożliwia synchronizację musi być rozwiązany przez użytkownika. Kliknij, aby uzyskać więcej informacji. + Wymagane działanie w aplikacji Brak powiadomień. OK Otwórz Otwieranie %s Brak aplikacji otwierającej ten typ pliku + Inne + Musisz przyznać uprawnienia do zapisu plików w pamięci telefonu, aby móc pobrać załącznik.\n\nKliknij OK, aby przyznać uprawnienia. + Odmówiłeś aplikacji wymaganych uprawnień do wykonania tej czynności.\n\nAby przynać uprawnienia, otwórz sekcję Uprawnienia dla aplikacji Szkolny.eu w ustawieniach telefonu.\n\nKliknij OK, aby przejść do ustawień aplikacji. + Wymagane uprawnienia Proszę czekać pl.szczodrzynski.edziennik_preferences pl.szczodrzynski.edziennik_profiles @@ -576,11 +887,19 @@ Usuń profil Potwierdź usunięcie Zamierzasz usunąć profil %s. Oznacza to usunięcie z aplikacji wszystkich danych powiązanych z tym profilem (ocen, planu lekcji, sprawdzianów…).\n\nWiększość danych będziesz mógł pobrać na nowo poprzez ponowne zalogowanie się.\n\nCzy rzeczywiście chcesz usunąć profil %s? + Skanuj kod QR Nigdy Później Oceń teraz Pokaż, że podoba ci się Szkolny.eu - oceń aplikację i spraw, by była jeszcze lepsza! Odśwież + Trwa wyrejestrowywanie użytkownika… + Stracisz możliwość korzystania z niektórych funkcji, takich jak Udostępnianie wydarzeń czy Przekazywanie powiadomień.\n\nFunkcja może być włączona/wyłączona w zależności od wybranego profilu. + Pobieranie udostępnionych wydarzeń… + Rejestracja jest automatyczna, jeśli ta opcja jest włączona. Pozwala na tworzenie i odbieranie wydarzeń udostępnionych innym uczniom z Twojej klasy. Dzięki temu, można dodawać do dziennika pozycje nie zapisane przez nauczyciela.\n\nKontynuując, oświadczasz przeczytanie i akceptację postanowień Polityki prywatności. + Aby móc udostępnić wydarzenie, należy włączyć opcję rejestracji na serwerze. Pozwala to na tworzenie i odbieranie wydarzeń udostępnionych w Twojej klasie.\n\nPo kliknięciu OK zostanie ona automatycznie włączona.\n\nKontynuując, oświadczasz przeczytanie i akceptację postanowień Polityki prywatności. + Udostępnianie wydarzeń + Rejestracja aplikacji Szkolny.eu Usuń Usunięto Zgłoś @@ -593,13 +912,21 @@ Dziennik zmian Albo lepiej nie klikaj… Kliknij, aby wywołać nieoczekiwany wyjątek + Dołącz do naszego serwera Discord! + Serwer Discord + Uwaga. Ta opcja może nie działać na niektórych urządzeniach oraz w niektórych fragmentach aplikacji. + Zmień język aplikacji + Polski + Język aplikacji Licencje open-source Polityka prywatności - E-dziennik - © Kuba Szczodrzyński && Kacper Ziubryniewicz\nwrzesień 2018 - listopad 2019 + E-dziennik + © Kuba Szczodrzyński && Kacper Ziubryniewicz\nwrzesień 2018 - 2021 Kliknij, aby sprawdzić aktualizacje Aktualizacja Wersja + Zaloguj konto ucznia/rodzica w aplikacji + Dodaj nowego ucznia Więcej Przekazywanie powiadomień Zmień obrazek @@ -607,6 +934,8 @@ Podaj nazwę profilu Zmień nazwę profilu Profil + Wyłącz określone rodzaje powiadomień + Filtruj powiadomienia Pokazuj powiadomienia z tego profilu Powiadamiaj o nowych danych Usuń obrazek profilu @@ -649,6 +978,7 @@ Będziesz otrzymywać udostępnione sprawdziany od innych osób z twojej klasy. Udostępniaj sprawdziany w swojej klasie Włącz Udostępnianie wydarzeń + Pokazuj nieobecności nauczycieli w Terminarzu Tablica ogłoszeń Obecności/nieobecności Dni wolne klasy @@ -683,7 +1013,7 @@ Wyłączona Pobieraj dane co %s Synchronizacja automatyczna - Synchronizacja i powiadomienia + Synchronizacja i powiadomienia Powiadamiaj o aktualizacjach aplikacji Pokazuj powiadomienia na swoim komputerze Przekazywanie powiadomień @@ -701,10 +1031,15 @@ Dostosuj przyciski menu bocznego Wyświetlaj menu po lewej stronie Pokaż menu boczne + Otwieraj menu przyciskiem wstecz + Dzwonią dzwonki sań + Pada śnieg, pada śnieg + Brrrr + Bajo jajo, bajo jajo Różowy Systemowy Motyw - Wygląd + Wygląd Udostępnij Udostępnij przez… Udostępnianie danych… @@ -713,6 +1048,9 @@ Zadania domowe Wiadomości Plan lekcji + Wystąpił błąd + Wg daty + Wg przedmiotu Wszystkie przedmioty %s - %s%% Semestr 1 @@ -721,7 +1059,7 @@ Jasne! Autoryzacja Tworzenie powiadomień - %s… + %s… Pobieranie konta Pobieranie listy kont Pobieranie certyfikatu @@ -732,8 +1070,8 @@ Synchronizuję Pobieranie informacji o koncie Pobieranie ogłoszeń szkolnych - Pobieranie kategorii obecności Pobieranie obecności + Pobieranie kategorii obecności Pobieranie kategorii ocen z zachowania Pobieranie ocen z zachowania Pobieranie kalendarza @@ -746,6 +1084,7 @@ Pobieranie wydarzeń Pobieranie sprawdzianów Pobieranie kategorii ocen + Pobieranie komentarzy ocen Pobieranie szczegółów ocen Pobieranie ocen Pobieranie zadań domowych @@ -759,6 +1098,7 @@ Pobieranie ocen punktowych Pobieranie proponowanych ocen Pobieranie zebrań z rodzicami + Pobieranie dni wolnych szkoły Pobieranie informacji o szkole Pobieranie udostępnionych wydarzeń Pobieranie przedmiotów @@ -782,8 +1122,8 @@ Podano nieprawidłową nazwę szkoły lub zawiera niedozwolone znaki. Podany adres serwera jest nieprawidłowy. Upewnij się, że jest wpisany poprawnie oraz nie zawiera żadnych spacji.\n\nWpisywany adres nie powinien zawierać części http://…mobidziennik.pl. Podano nieprawidłowy token. - Konto LIBRUS utraciło połączenie z kontem Synergia. Zaloguj się na stronie portal.librus.pl lub w oficjalnej aplikacji Librus i postępuj zgodnie z instrukcją, aby naprawić konto. - Konto LIBRUS nie zostało aktywowane. Aktywuj konto korzystając z otrzymanego e-maila. + Konto LIBRUS® Rodzina utraciło połączenie z kontem LIBRUS® Synergia. Zaloguj się na stronie portal.librus.pl lub w oficjalnej aplikacji "LIBRUS®" i postępuj zgodnie z instrukcją, aby naprawić konto. + Konto LIBRUS® Rodzina nie zostało aktywowane. Aktywuj konto korzystając z otrzymanego e-maila. Bład logowania Chwilowa przerwa techniczna\n\nSpróbuj ponownie później Nie znaleziono adresu API. Spróbuj zalogować urządzenie ponownie. @@ -796,6 +1136,7 @@ Uczeń %s nie jest przypisany do tego konta w dzienniku (login: %s).\n\nSpróbuj zalogować się ponownie, aczkolwiek może to oznaczać przerwę techniczną e-dziennika. Błąd podczas zapisywania danych. Zgłoś błąd deweloperowi. Nie można nawiązać bezpiecznego połączenia. + Konto LIBRUS® Synergia nie zostało potwierdzone przez rodzica/opiekuna prawnego.\n\nZaloguj się na stronie portal.librus.pl i postępuj zgodnie z instrukcjami. Przekroczono czas oczekiwania.\n\nNiewystarczająca jakość połączenia internetowego lub przerwa techniczna e-dziennika Nieznany błąd Pobieram terminarz… @@ -817,6 +1158,9 @@ Dołącz odpowiedź API (zalecane) Zgłaszanie błędu Usługa synchronizacji + model + position + viewType Kliknij na ikonę, aby oznaczyć wszystkie dane jako przeczytane. Powiadomienia Kliknij na nagłówek menu, aby zmienić lub dodać profil ucznia. Znajdziesz tam też ręczną synchronizację wszystkich profili. @@ -826,29 +1170,88 @@ Inni Rodzic Rada rodziców - Pedagog / psycholog + Pedagog / Psycholog Dyrektor - Szkolny administrator + Szkolny Administrator Szkolna rada rodziców Sekretariat + Specjaliści Uczeń Administrator / SuperAdministrator Nauczyciel Przeglądaj kategorię pojutrze przedwczoraj + Bursztynowy + Czarny / OLED + Niebieski + Czekoladowy + Ciemny + Ciemny niebieski + Ciemny zielony + Ciemny fioletowy + Ciemny czerwony + Indygo + Jasny + Jasny niebieski + Jasny zielony + Jasny fioletowy + Jasny czerwony + Jasny żółty + Fioletowy + Czerwony + Pokaż plan lekcji + W tym dniu nie ma lekcji: + Dzień wolny Ze zmianami na ten tydzień (%s do %s) Do wydruku (bez zmian, oszczędza kolory) Wyświetl nazwę profilu ucznia Ze zmianami na następny tydzień (%s do %s) Bez zmian lekcji + Do wydruku (oszczędza kolory) Może to potrwać kilkanaście sekund… Generowanie planu lekcji Zakres generowanego planu + Na wybrany tydzień + Pokaż nazwę profilu + Pokaż imiona i nazwiska nauczycieli Plan lekcji w formie obrazka został zapisany w katalogu Szkolny.eu.\n\nMożesz go od razu otworzyć albo udostępnić. Gotowe + Lekcja odwołana + Zastępstwo + Zastępstwo: zamiast %s + Lekcja przeniesiona na inny termin + Lekcja przeniesiona z innego terminu + Lekcja przeniesiona z dnia %s, godz. %s + Lekcja przeniesiona z godz. %s + Lekcja przeniesiona na %s, godz. %s + Lekcja przeniesiona na godz. %s + Data + Wybierz datę + Wybierz przedmiot + Godzina + Wybierz godzinę + %s (lekcja %d) + Nie dodano własnych lekcji na ten dzień. + Na każdej lekcji przedmiotu %s + Obejmuje plan lekcji na każdy tydzień + Wg. przedmiotu + Jednorazowo + Cyklicznie (brak sali) Brak lekcji tego dnia + Brak lekcji tego dnia + (brak nazwy) + Pobierz plan lekcji + Nie pobrano planu lekcji na ten tydzień. + Brak planu lekcji + na tydzień %s + Skontaktuj się z wychowawcą w celu udostępnienia planu lekcji. + Plan lekcji nie został opublikowany przez szkołę. + Brak planu lekcji + Wybierz dzień + Pobieranie planu lekcji na wybrany tydzień… + Dzisiaj Synchronizuj wszystko Debugowanie Pomoc i opinie @@ -859,6 +1262,10 @@ Menadżer profili Zmień semestr Zmieniam profil ucznia + dzisiaj + jutro + Synchronizuję… + [%d%%] %s transition_name Nieznany Wymagana aktualizacja @@ -866,10 +1273,13 @@ Próbujesz uruchomić starszą wersję aplikacji, co może uszkodzić jej dane. Sparowane przeglądarki Brak połączenia z serwerem. + Połączono %s Brak sparowanych przeglądarek. Sparuj przeglądarkę Czy na pewno chcesz usunąć tą przeglądarkę? + Token nie wygląda na prawidłowy Nie możesz tego zrobić + Odłącz Musisz włączyć rejestrację automatyczną, by korzystać z przekazywania powiadomień.\n\nZaznacz \"Zezwól na rejestrację\" w ustawieniach logowania. Co chcesz zrobić? Co to jest? @@ -887,193 +1297,171 @@ Synchronizuj Użyj większej czcionki Brak lekcji tego dnia. + Brak lekcji przez następne 7 dni. + Plan lekcji nie został pobrany.\n\nOtwórz aplikację i wykonaj synchronizację, aby pobrać plan lekcji. Wybrany profil nie istnieje.\nUsuń widget i spróbuj ponownie. + Brak lekcji przez nast. 7 dni. + Nie pobrano planu lekcji. Plan lekcji Łączony plan lekcji Tak wczoraj Jesteś offline. Spróbuj włączyć Wi-Fi lub dane komórkowe. Połączenie sieciowe - Wiadomość - Dodaj wydarzenie - Zapisz własne wydarzenie lub zadanie domowe w Terminarzu - Zmień widok Terminarza - Średnie ocen - Pokaż średnie semestralne i końcoworoczne - Kolor wyświetlanych ocen - Wg daty - Wg przedmiotu - Sposób obliczania średniej końcoworocznej - Sortuj oceny - Konto Synergia nie zostało potwierdzone przez rodzica/opiekuna prawnego.\n\nZaloguj się na stronie portal.librus.pl i postępuj zgodnie z instrukcjami. - Pomoc i opinie - Podano nieprawidłowy moduł: %d Zgłoś błąd programiście - Serwer Discord - Dołącz do naszego serwera Discord! - Debugowanie - Logowanie do Portalu Librus - Logowanie do API - Logowanie do Librus Synergia - Logowanie do wiadomości Librus - Usługa synchronizacji - Dzięki niej, aplikacja Szkolny.eu może synchronizować dane z e-dziennikiem. Możesz ją zamknąć, ponieważ w tej chwili nic nie robi. - Zamknij - Anuluj - Trwa synchronizacja profilu %s... - Synchronizacja przerwana - Zgłaszanie błędów... - Zgłaszanie błędów - Pobieram informacje o uczniu... - Pobieranie dni wolnych szkoły - Aktualne - Minione - Brak zadań domowych. - Nieobecni nauczyciele - Pobieranie komentarzy ocen - Pokazuj nieobecności nauczycieli w Terminarzu - Pobieram informacje o szkole... - Pobieranie ocen ucznia... - Pobieranie kategorii ocen... - Logowanie do Template WEB... - Logowanie do Template API... - Logowanie do MobiDziennika... - Logowanie do API MobiDziennika... - Pobieram dane... - Pobieram wiadomości odebrane... - Pobieram wiadomości... - Pobieram szczęśliwy numerek... - Pobieram kalendarz... - Pobieram uwagi ucznia... - Pobieram frekwencję ucznia... - Logowanie do Vulcan API... - Logowanie do API MobiDziennika... - Pobieranie wydarzeń kalendarza... - Pobieranie zadań domowych... - Pobieranie kategorii obecności... - Pobieranie ogłoszeń szkolnych... - Pierwsze logowanie - Pobieranie informacji o klasie... - Pobieranie nieobecności nauczycieli... - Pobieranie rodzajów nieobecności nauczycieli... - Pobieranie słowników... - Synchronizuję... - [%d%%] %s - Pobieranie uwag... - Pobieranie grup klasowych... - Pobieranie informacji o jednostce... - Pobieranie listy nauczycieli... - Pobieranie listy przedmiotów... - Pobieranie listy sal lekcyjnych... - Pobieranie kategorii wydarzeń... - Pobieranie kategorii uwag... - Pobieranie zebrań z rodzicami... - Logowanie do iDziennika... - Logowanie do iDziennika... - Pobieranie wiadomości wysłanych... - (rodzic) - (uczeń) - Język aplikacji - Polski - Zmień język aplikacji - Uwaga. Ta opcja może nie działać na niektórych urządzeniach oraz w niektórych fragmentach aplikacji. - Według systemu - Polski - English - Pobieranie planu lekcji... - Pobieranie ocen proponowanych... - Pobieranie listy sprawdzianów... - Wykryto problem z synchronizacją - Na urządzeniu prawdopodobnie zainstalowany jest menedżer aplikacji, który może powodować problemy z synchronizacją automatyczną.\n\nNależy wyłączyć w ustawieniach telefonu optymalizację baterii dla aplikacji Szkolny.eu.\n\nKliknij OK, aby przejść do ustawień telefonu. - Nie pytaj ponownie - Nie udało się otworzyć ustawień - Tworzenie powiadomień - Librus - logowanie - Dzisiaj - Lekcja odwołana - Zastępstwo - Zastępstwo: zamiast %s - Lekcja przeniesiona na godz. %s - Lekcja przeniesiona na %s, godz. %s - Lekcja przeniesiona z godz. %s - Lekcja przeniesiona z dnia %s, godz. %s - Lekcja przeniesiona na inny termin - Lekcja przeniesiona z innego terminu - Brak planu lekcji - Plan lekcji nie został opublikowany przez szkołę. - Skontaktuj się z wychowawcą w celu udostępnienia planu lekcji. - Dzień wolny - W tym dniu nie ma lekcji: - Pokaż plan lekcji - Brak lekcji tego dnia - Brak planu lekcji - Nie pobrano planu lekcji na ten tydzień. - Pobierz plan lekcji - na tydzień %s - Nauczyciel - Sala lekcyjna - Grupa - ID lekcji - Nr lekcji - Lekcja przeniesiona na %s - Lekcja przeniesiona z %s - Dodaj wpis do terminarza - Lekcja/godzina - nast. lekcja %s - jutro (%s) - %s (%s) - -- inna data -- - dzisiaj (%s) - następny %s (%s) - Nie ma lekcji tego dnia - Profil został usunięty. - Wystąpił błąd - Synchronizacja ręczna - (brak nazwy) - Więcej opcji - Pobieranie komentarzy ocen... - Usuń wszystkie - Wyczyszczono powiadomienia - Wybierz dzień - Przesuń w górę - Przesuń w dół - %s • Kliknij, aby ustawić swój numerek. - %s • Numer w dzienniku to %d - Brak informacji o szczęśliwym numerku. - Dzisiaj to Ty masz szczęśliwy numerek! - Jutro to Ty masz szczęśliwy numerek! - Dnia %s Twój numerek jest szczęśliwy. - Dnia %s szczęśliwy numerek to %d. - %d to dzisiejszy szczęśliwy numerek. - %d to szczęśliwy numerek na jutro. - Nie ma dzisiaj szczęśliwego numerka. - Jutro (%1$s) - %1$s, %2$s - %1$s, %2$s - %d lekcji - %s do %s - Pierwsza: %s - Później: - brak lekcji - Dzisiaj - Teraz: %s - Za chwilę: %s - Pozostało lekcji: %d - do %s - z %s - %s%s - Pobieranie ocen z zachowania... - Synchronizowanie udostępnionych wydarzeń... - Otwieraj menu przyciskiem wstecz - Zaloguj się tokenem i kodem PIN, który można wygenerować po zalogowanu się do Synergii w zakładce Aplikacje mobilne. - Nieprawidłowy token lub PIN - Nieprawidłowy kod lub PIN - Nieprawidłowy kod - Podaj kod - Dodano %1$s przez %2$s%3$s - Dodano %1$s%3$s - Dodano %1$s przez Ciebie%3$s - Udostępniono %1$s przez %2$s%3$s - Udostępniono %1$s przez Ciebie%3$s - Pada śnieg, pada śnieg - Dzwonią dzwonki sań - Brak wydarzeń tego dnia. - %s, %s + Wg typu + %d przez cały rok + %d w tym semestrze + Nauczyciel + Rodzaj + Data + Godzina + Temat lekcji + Liczona do puli? + ID frekwencji + ID rodzaju podstawowego + Jaki masz e-dziennik w szkole? + Wybierz z jakiego e-dziennika korzysta Twoja szkoła. Jeśli masz kilka kont w różnych dziennikach, będziesz mógł je dodać później. + LIBRUS® Rodzina / Synergia + Zaloguj używając e-maila + Musisz posiadać konto LIBRUS® Rodzina + Zaloguj używając loginu i hasła + Użyj loginu w postaci \"9874123u\" + Logowanie przez platformę VULCAN® + Tylko Oświata w Radomiu oraz Innowacyjny Tarnobrzeg + VULCAN® UONET+ + Użyj tokenu, symbolu i kodu PIN + Zarejestruj urządzenie na stronie dziennika VULCAN® + Użyj e-maila/nazwy użytkownika i hasła + Zaloguj danymi, które podajesz na stronie e-dziennika VULCAN® + MobiDziennik + Zaloguj nazwą serwera, loginem i hasłem + Podaj dane, których używasz na stronie e-dziennika + W jaki sposób się logujesz do dziennika? + Wybierz, który obrazek odpowiada temu, który widzisz podczas logowania na stronie internetowej swojego dziennika.\n\nJeżeli Twoja szkoła nie korzysta z żadnej z tych platform miejskich, wybierz pierwszą opcję. + Ładowanie listy e-dzienników… + Jeśli trwa to za długo, sprawdź swoje połączenie internetowe i zrestartuj aplikację. + Zaloguj się - %s + Zaloguj się swoim kontem LIBRUS® Rodzina, które działa w oficjalnej aplikacji "LIBRUS®" oraz na stronie portal.librus.pl, w niebieskim formularzu.\n\nJeśli nie masz konta LIBRUS® Rodzina, możesz je założyć na stronie https://portal.librus.pl/rodzina/register. + Podaj login otrzymany od szkoły, którym logujesz się do LIBRUS® Synergia (fioletowy formularz).\n\nZalecane jest logowanie kontem LIBRUS® Rodzina (używając e-maila) w poprzednim kroku. + Zaloguj się do LIBRUS® Synergia na komputerze, wybierz zakładkę Aplikacje Mobilne, następnie wpisz otrzymany Token i PIN poniżej. + Zaloguj się do dziennika VULCAN® na komputerze, wybierz zakładkę Dostęp Mobilny, kliknij przycisk Zarejestruj urządzenie mobilne. Podaj otrzymany Token, Symbol i PIN w polach poniżej. + Podaj dane, którymi logujesz się na stronie internetowej dziennika VULCAN® lub na miejskiej platformie. + Podaj dane, których używasz do logowania na stronie MobiDziennika. Jako adres serwera możesz wpisać adres strony internetowej, na której masz MobiDziennik. + Logowanie do dziennika VULCAN®... + EduDziennik + Zaloguj używając e-maila i hasła + Użyj danych, które podajesz na stronie internetowej e-dziennika + Podaj adres e-mail i hasło, których używasz do logowania w przeglądarce na stronie EduDziennika. + Podlaska Platforma Edukacyjna + Zaloguj używając tokenu + Podaj token aplikacji mobilnej. + Logowanie do PPE… + Profil jest archiwalny + Przeglądasz dane ucznia z poprzedniego roku szkolnego (%d/%d). Synchronizacja oraz pobieranie wiadomości i niektórych zadań domowych zostały wyłączone.\n\nAby otworzyć profil ucznia z aktualnego roku, wybierz "Zamknij archiwum" na stronie głównej. + Wakacje ;) + Prawdopodobnie rok szkolny dla tego ucznia jeszcze się nie zaczął (zacznie się %s). Spróbuj wykonać synchronizację później. + Koniec roku szkolnego + Rok szkolny zakończył się %s. Dane ucznia z poprzedniego roku zostaną przeniesione do archiwum, aby można było je później przeglądać. + Profil archiwalny + Przeglądasz dane ucznia z roku szkolnego %d/%d. + Zamknij archiwum + Brak aktualnego profilu + Uczeń %s nie posiada profilu na tym koncie w aktualnym roku szkolnym. Prawdopodobnie ten profil został usunięty lub uczeń nie uczęszcza już do tej klasy.\n\nAby przejść do aktualnego profilu, wybierz ucznia z listy lub zaloguj się na jego konto przyciskiem Dodaj ucznia. + Znaki towarowe zamieszczone w tej aplikacji należą do ich prawowitych właścicieli i są używane wyłącznie w celach informacyjnych. + Dostępna aktualizacja aplikacji + Używasz starej wersji aplikacji Szkolny.eu (%s). Aby móc korzystać z aplikacji oraz zapewnić najlepsze działanie, zaktualizuj aplikację do wersji %s.\n\nDziennik zmian:\n%s + Posiadasz nieaktualną wersję aplikacji Szkolny.eu. Aby móc dalej synchronizować dane, musisz zaktualizować aplikację. + Aktualizuj + Nie teraz + Dostępna aktualizacja + Zaktualizuj aplikację do najnowszej wersji %s. + Zobacz więcej + Aktualizuj + Dowiedz się więcej + Stara nie zobaczy pał + Wyloguj z pozostałych urządzeń + Wersja testowa + Wybrany sposób logowania jest jeszcze w fazie testów i może nie działać poprawnie.\n\nJeśli masz problemy z aplikacją, wybierz zalecany sposób logowania. + {cmd-information-outline} Zalecane + {cmd-alert-circle-outline} Wersja testowa + {cmd-android-studio} Wersja deweloperska + \??? + Szkoda, opinie innych pomagają mi rozwijać aplikację. + Nie znaleziono profilu ucznia. + Zobacz także + Wejdź na stronę aplikacji + Uzyskaj pomoc lub wesprzyj autorów + Twórcy aplikacji + Lista twórców Szkolnego + Współtwórcy + Tłumacze + Kod źródłowy + Pomóż w rozwoju aplikacji na GitHubie + Nazwa profilu + Synchronizuj ten profil + Wyloguj się + Aby móc zeskanować kod QR musisz przyznać uprawnienia dostępu do kamery.\n\nKliknij OK, aby przyznać uprawnienia. + Wersja aplikacji + Wydanie oficjalne + Dystrybucja + Google Play + .APK + Nieoficjalnie (.APK) + Gałąź Git + Identyfikator rewizji + Niezapisane zmiany + Ostatni tag + Rewizje od ostatniego tagu + Repozytorium zdalne + Informacje o kompilacji + Trwa weryfikowanie kompilacji… + Nie znaleziono odniesienia do repozytorium zdalnego. Upewnij się, że korzystasz z fork\'a oficjalnego repozytorium oraz zweryfikuj konfigurację Gradle. + Nie znaleziono wartości skrótu aktualnej rewizji. Sprawdź konfigurację Gradle. + Posiadasz kompilację aplikacji zawierającą nieopublikowane zmiany. Kompilacja znajduje się w repozytorium:\n%1$s (%2$s)\nktóre jest prywatne lub nie zawiera najnowszych zmian.\n\nDla bezpieczeństwa oraz ze względów zgodności z licencją, korzystanie z aplikacji zostało zablokowane. + Nie możesz modyfikować tego rodzaju kompilacji aplikacji Szkolny.eu.\n\nAby wprowadzić własne zmiany, skorzystaj z kodu źródłowego dostępnego na GitHubie oraz zapoznaj się z README i informacją o licencji.\n\nhttps://szkolny.eu/github/android + Ta kompilacja zawiera zmiany niezatwierdzone do żadnej rewizji. Zapisz oraz opublikuj wszystkie zmiany przed wydaniem wersji \"release\".\n\nDla bezpieczeństwa oraz ze względów zgodności z licencją, korzystanie z aplikacji zostało zablokowane. + Korzystasz z kompilacji typu \"debug\". Ta informacja zostanie wyświetlona tylko jeden raz dla aktualnego urządzenia. + Korzystasz z nieoficjalnej kompilacji aplikacji Szkolny.eu. Zalecamy używanie wyłącznie oficjalnych wersji aplikacji.\n\nOstatnie zmiany w tej wersji zostały wprowadzone przez:\n%3$s\nw repozytorium:\n%1$s (%2$s).\n\nTo okno nie wyświetli się ponownie. + Informacja dotycząca wersji aplikacji + Szczegóły wersji + Informacje o kompilacji + Sprawdź kod + Brak dostępu do API + Data kompilacji + Aby móc zapisać wygenerowany plan lekcji musisz przyznać uprawnienia dostępu do pamięci urządzenia.\n\nKliknij OK, aby przyznać uprawnienia. + przeczytanie Polityki prywatności i akceptujesz jej postanowienia.

    Autorzy aplikacji nie biorą odpowiedzialności za korzystanie z aplikacji Szkolny.eu.]]>     + Szkolny.eu v%s\n%s + Ustawienia terminarza + Wygląd + Pokazuj zmiany planu lekcji + Pokazuj nieobecności nauczycieli + Tryb kompaktowy + Mniejszy rozmiar wydarzeń na liście + Grupuj wydarzenia tego samego typu + Niedostępne w trybie kalendarza + Udostępnianie wydarzeń + Włącz Udostępnianie wydarzeń + Nauczanie zdalne + Ustaw wydarzenia jako lekcje on-line + Wybierz rodzaj wydarzeń + Grupuj lekcje on-line na liście + {cmd-clipboard-edit-outline} wydarzenie dodane ręcznie + {cmd-check} oznaczono jako wykonane + Funkcja jeszcze nie jest dostępna. + Tworzenie wiadomości + Dodaj podpis przy tworzeniu wiadomości + Dodaj podpis przy odpowiadaniu na wiadomość + Dodaj podpis przy przekazywaniu wiadomości + Treść podpisu + Ustawienia wiadomości + lekcja online + Rodzaj: %s\nData: %s (%s)\nLekcja: %s\nNauczyciel: %s + Rodzaj: %s\nPrzedmiot: %s\nTermin: %s (%s), %s\nTreść: %s + Dodane przez: %s\nRodzaj: %s\nPrzedmiot: %s\nTermin: %s (%s), %s\nTreść: %s + Ocena: %s (waga %s)\nPrzedmiot: %s\nKategoria: %s\nOpis: %s\nNauczyciel: %s + Rodzaj: %s\nNauczyciel: %s\nTreść: %s + Rodzaj: %s\nTermin: %s, %s\nNr lekcji: %s\nPrzedmiot: %s\nNauczyciel: %s\nTemat lekcji: %s + \@%s - %s + Najłatwiejszy sposób na korzystanie z e-dziennika. + Szczegóły     diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c6c7da22..4f22fc81 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -10,63 +10,88 @@ @drawable/dead_background - - + + + + + + diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml index 9b85b4b7..f5417ebb 100644 --- a/app/src/main/res/xml/backup_descriptor.xml +++ b/app/src/main/res/xml/backup_descriptor.xml @@ -2,6 +2,4 @@ - - diff --git a/app/src/main/res/xml/widget_lucky_number_info.xml b/app/src/main/res/xml/widget_lucky_number_info.xml index 18721b35..813afadc 100644 --- a/app/src/main/res/xml/widget_lucky_number_info.xml +++ b/app/src/main/res/xml/widget_lucky_number_info.xml @@ -11,5 +11,5 @@ android:resizeMode="horizontal|vertical" android:updatePeriodMillis="1800000" android:widgetCategory="home_screen" - android:configure="pl.szczodrzynski.edziennik.widgets.WidgetConfigActivity" + android:configure="pl.szczodrzynski.edziennik.ui.widgets.WidgetConfigActivity" tools:ignore="UnusedAttribute" /> diff --git a/app/src/main/res/xml/widget_notifications_info.xml b/app/src/main/res/xml/widget_notifications_info.xml index e15ea4b9..4720f1b1 100644 --- a/app/src/main/res/xml/widget_notifications_info.xml +++ b/app/src/main/res/xml/widget_notifications_info.xml @@ -11,5 +11,5 @@ android:resizeMode="horizontal|vertical" android:updatePeriodMillis="5400000" android:widgetCategory="home_screen" - android:configure="pl.szczodrzynski.edziennik.widgets.WidgetConfigActivity" + android:configure="pl.szczodrzynski.edziennik.ui.widgets.WidgetConfigActivity" tools:ignore="UnusedAttribute" /> diff --git a/app/src/main/res/xml/widget_timetable_info.xml b/app/src/main/res/xml/widget_timetable_info.xml index a549737f..c0a5b3d4 100644 --- a/app/src/main/res/xml/widget_timetable_info.xml +++ b/app/src/main/res/xml/widget_timetable_info.xml @@ -11,5 +11,5 @@ android:resizeMode="horizontal|vertical" android:updatePeriodMillis="1800000" android:widgetCategory="home_screen" - android:configure="pl.szczodrzynski.edziennik.widgets.WidgetConfigActivity" + android:configure="pl.szczodrzynski.edziennik.ui.widgets.WidgetConfigActivity" tools:ignore="UnusedAttribute" /> diff --git a/build.gradle b/build.gradle index 023b5378..a8665c89 100644 --- a/build.gradle +++ b/build.gradle @@ -2,73 +2,29 @@ buildscript { ext { - kotlin_version = '1.3.50' + kotlin_version = '1.5.20' release = [ - versionName: "3.9.15-dev", - versionCode: 3091500 + versionName: "4.10", + versionCode: 4100099 ] setup = [ - compileSdk: 28, - buildTools: "28.0.3", + compileSdk: 30, minSdk : 16, - targetSdk : 28 - ] - - versions = [ - kotlin : "1.3.50", - ktx : "1.1.0", - - androidX : '1.0.0', - annotation : '1.1.0', - recyclerView : '1.1.0', - material : '1.2.0-alpha02', - appcompat : '1.1.0', - constraintLayout : '2.0.0-beta3', - cardview : '1.0.0', - gridLayout : '1.0.0', - navigation : "2.0.0", - navigationFragment: "1.0.0", - legacy : "1.0.0", - - room : "2.2.1", - lifecycle : "2.2.0-rc02", - work : "2.2.0", - - firebase : '17.2.1', - firebasemessaging: "20.0.0", - play_services : "17.0.0", - - materialdialogs : "0.9.6.0", - materialdrawer : "cad66092a6", - iconics : "4.0.1", - font_cmd : "3.5.95.1-kotlin", - - navlib : "8b31921697", - - gifdrawable : "1.2.15", - - retrofit : '2.6.2' + targetSdk : 30 ] } repositories { - maven { - url 'https://maven.fabric.io/public' - } google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' - classpath 'me.tatarka:gradle-retrolambda:3.7.0' - classpath 'com.google.gms:google-services:4.3.1' - classpath 'io.fabric.tools:gradle:1.28.1' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.google.gms:google-services:4.3.10' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' } } @@ -85,26 +41,10 @@ allprojects { maven { url 'https://jitpack.io' } maven { url "https://kotlin.bintray.com/kotlinx/" } maven { url "https://dl.bintray.com/wulkanowy/wulkanowy" } + maven { url "https://dl.bintray.com/undervoid/PowerPermission" } } } -ext { - compileSdkVersion = 28 - buildToolsVersion = '28.0.3' - targetSdkVersion = compileSdkVersion - minSdkVersion = 16 - - androidXAppCompat = '1.1.0-beta01' - androidXRecyclerView = '1.1.0-alpha06' - androidXCardView = '1.0.0' - androidXGridLayout = '1.0.0' - androidXConstraintLayout = '1.1.3' - googleMaterial = '1.1.0-alpha07' - - iconics = '4.0.1-b01' - kotlin = '1.3.41' -} - task clean(type: Delete) { delete rootProject.buildDir } diff --git a/cafebar/build.gradle b/cafebar/build.gradle deleted file mode 100644 index 31b0b482..00000000 --- a/cafebar/build.gradle +++ /dev/null @@ -1,64 +0,0 @@ -apply plugin: 'com.android.library' - -/* - * CafeBar - * - * Copyright (c) 2017 Dani Mahardhika - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -group = 'com.github.danimahardhika' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 132 - versionName "1.3.2" - vectorDrawables.useSupportLibrary = true - - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - debugMinify { - debuggable = true - minifyEnabled = true - proguardFiles 'proguard-android.txt' - } - } - - lintOptions { - abortOnError false - } - - sourceSets { - main.res.srcDirs = [ - 'src/main/res', - 'src/main/res-public' - ] - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "com.google.android.material:material:${googleMaterial}" - implementation "androidx.cardview:cardview:${androidXCardView}" - implementation "androidx.appcompat:appcompat:${androidXAppCompat}" -} diff --git a/cafebar/src/main/AndroidManifest.xml b/cafebar/src/main/AndroidManifest.xml deleted file mode 100644 index e0513a98..00000000 --- a/cafebar/src/main/AndroidManifest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBar.java b/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBar.java deleted file mode 100644 index 7c376733..00000000 --- a/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBar.java +++ /dev/null @@ -1,712 +0,0 @@ -package com.danimahardhika.cafebar; - -/* - * CafeBar - * - * Copyright (c) 2017 Dani Mahardhika - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import android.app.Activity; -import android.content.Context; -import android.content.res.Configuration; -import android.graphics.Bitmap; -import android.graphics.Typeface; -import android.graphics.drawable.Drawable; -import android.os.Build; -import android.text.SpannableStringBuilder; -import android.view.View; -import android.view.ViewTreeObserver; -import android.view.Window; -import android.view.WindowManager; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.google.android.material.snackbar.Snackbar; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.ref.WeakReference; -import java.util.HashMap; - -import androidx.annotation.BoolRes; -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.IntDef; -import androidx.annotation.IntRange; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.appcompat.view.ContextThemeWrapper; -import androidx.cardview.widget.CardView; -import androidx.coordinatorlayout.widget.CoordinatorLayout; - -@SuppressWarnings("unused") -public class CafeBar { - - static final String FONT_CONTENT = "content"; - static final String FONT_POSITIVE = "positive"; - static final String FONT_NEGATIVE = "negative"; - static final String FONT_NEUTRAL = "neutral"; - - private Builder mBuilder; - private Snackbar mSnackBar; - - private CafeBar(@NonNull Builder builder) { - mBuilder = builder; - - View baseLayout = mBuilder.mCustomView; - if (baseLayout == null) { - LogUtil.d("CafeBar doesn't have customView, preparing it ..."); - baseLayout = CafeBarUtil.getBaseCafeBarView(mBuilder); - } - - mSnackBar = CafeBarUtil.getBaseSnackBar(baseLayout, mBuilder); - if (mSnackBar == null) { - mBuilder = null; - throw new IllegalStateException("CafeBar base is null"); - } - - if (mBuilder.mCustomView != null) { - LogUtil.d("CafeBar has custom view, set buttons ignored"); - return; - } - - if (mBuilder.mPositiveText == null && mBuilder.mNegativeText == null) { - //Only contains neutral button - if (mBuilder.mNeutralText != null) { - int neutralColor = CafeBarUtil.getAccentColor(mBuilder.mContext, mBuilder.mNegativeColor); - setAction(mBuilder.mNeutralText, neutralColor, mBuilder.mNeutralCallback); - } - } else { - //Contains positive or negative button - LinearLayout root = (LinearLayout) getView(); - LinearLayout buttonBase = root.findViewById(R.id.cafebar_button_base); - - if (mBuilder.mNeutralText != null) { - TextView neutral = buttonBase.findViewById(R.id.cafebar_button_neutral); - neutral.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - if (mBuilder.mNeutralCallback != null) { - mBuilder.mNeutralCallback.OnClick(getCafeBar()); - return; - } - - dismiss(); - } - }); - } - - if (mBuilder.mNegativeText != null) { - TextView negative = buttonBase.findViewById(R.id.cafebar_button_negative); - negative.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - if (mBuilder.mNegativeCallback != null) { - mBuilder.mNegativeCallback.OnClick(getCafeBar()); - return; - } - - dismiss(); - } - }); - } - - if (mBuilder.mPositiveText != null) { - TextView positive = buttonBase.findViewById(R.id.cafebar_button_positive); - positive.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - if (mBuilder.mPositiveCallback != null) { - mBuilder.mPositiveCallback.OnClick(getCafeBar()); - return; - } - - dismiss(); - } - }); - } - } - } - - public static void enableLogging(boolean enableLogging) { - LogUtil.sEnableLogging = enableLogging; - } - - @NonNull - public static CafeBar make(@NonNull Context context, @StringRes int res, @Snackbar.Duration int duration) { - String string = context.getResources().getString(res); - return create(context, null, string, duration); - } - - @NonNull - public static CafeBar make(@NonNull Context context, @NonNull String content, @Snackbar.Duration int duration) { - return create(context, null, content, duration); - } - - @NonNull - public static CafeBar make(@NonNull View to, @StringRes int res, @Snackbar.Duration int duration) { - Context context = to.getContext(); - if (context instanceof ContextThemeWrapper) { - context = ((ContextThemeWrapper) context).getBaseContext(); - } - String string = context.getResources().getString(res); - return create(context, to, string, duration); - } - - @NonNull - public static CafeBar make(@NonNull View to, @NonNull String content, @Snackbar.Duration int duration) { - Context context = to.getContext(); - if (context instanceof ContextThemeWrapper) { - context = ((ContextThemeWrapper) context).getBaseContext(); - } - return create(context, to, content, duration); - } - - @NonNull - private static CafeBar create(@NonNull Context context, @Nullable View to, @NonNull String content, @Snackbar.Duration int duration) { - CafeBar.Builder builder = new Builder(context); - builder.to(to); - builder.content(content); - builder.duration(duration); - if (duration == Snackbar.LENGTH_INDEFINITE) { - builder.autoDismiss(false); - } - return new CafeBar(builder); - } - - public CafeBar setAction(@StringRes int res, @Nullable CafeBarCallback callback) { - String string = mBuilder.mContext.getResources().getString(res); - int actionColor = CafeBarUtil.getAccentColor(mBuilder.mContext, mBuilder.mTheme.getTitleColor()); - setButtonAction(string, actionColor, callback); - return this; - } - - public CafeBar setAction(@NonNull String action, @Nullable CafeBarCallback callback) { - int actionColor = CafeBarUtil.getAccentColor(mBuilder.mContext, mBuilder.mTheme.getTitleColor()); - setButtonAction(action, actionColor, callback); - return this; - } - - public CafeBar setAction(@StringRes int res, int color, @Nullable CafeBarCallback callback) { - String string = mBuilder.mContext.getResources().getString(res); - setButtonAction(string, color, callback); - return this; - } - - public CafeBar setAction(@NonNull String action, int color, @Nullable CafeBarCallback callback) { - setButtonAction(action, color, callback); - return this; - } - - private void setButtonAction(@NonNull String action, int color, @Nullable final CafeBarCallback callback) { - if (mBuilder.mCustomView != null) { - LogUtil.d("CafeBar has customView, setAction ignored."); - return; - } - - LogUtil.d("preparing action view"); - mBuilder.mNeutralText = action; - mBuilder.mNeutralColor = color; - - LinearLayout root = (LinearLayout) getView(); - boolean longAction = CafeBarUtil.isLongAction(action); - - if (root.getChildCount() > 1) { - LogUtil.d("setAction already set from builder via neutralText"); - return; - } - - TextView content = root.findViewById(R.id.cafebar_content); - - int side = mBuilder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_content_padding_side); - int top = mBuilder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_content_padding_top); - int buttonPadding = mBuilder.mContext.getResources().getDimensionPixelSize( - R.dimen.cafebar_button_padding); - int bottom = 0; - - if (longAction) { - bottom = buttonPadding; - root.setOrientation(LinearLayout.VERTICAL); - content.setPadding(0, 0, buttonPadding, 0); - } else { - LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) content.getLayoutParams(); - params.width = 0; - params.weight = 1f; - content.setLayoutParams(params); - } - - int navBar = 0; - if (mBuilder.mFitSystemWindow && !mBuilder.mFloating) { - navBar = CafeBarUtil.getNavigationBarHeight(mBuilder.mContext); - } - - Configuration configuration = mBuilder.mContext.getResources().getConfiguration(); - boolean tabletMode = mBuilder.mContext.getResources().getBoolean(R.bool.cafebar_tablet_mode); - - if (tabletMode || configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { - if (mBuilder.mLongContent) { - LogUtil.d("content has multi lines"); - root.setPadding(side, side, (side - buttonPadding), (side - bottom + navBar)); - } else if (longAction){ - LogUtil.d("content only 1 line with longAction"); - root.setPadding(side, top, (side - buttonPadding), (top - buttonPadding + navBar)); - } else { - LogUtil.d("content only 1 line"); - root.setPadding(side, (top - buttonPadding), (side - buttonPadding), (top - buttonPadding + navBar)); - } - } else { - if (mBuilder.mLongContent) { - LogUtil.d("content has multi lines"); - root.setPadding(side, side, (side - buttonPadding + navBar), (side - bottom)); - } else if (longAction) { - LogUtil.d("content only 1 line with longAction"); - root.setPadding(side, top, (side - buttonPadding + navBar), (top - buttonPadding)); - } else { - LogUtil.d("content only 1 line"); - root.setPadding(side, (top - buttonPadding), (side - buttonPadding + navBar), (top - buttonPadding)); - } - } - - TextView button = CafeBarUtil.getActionView(mBuilder, action, color); - if (mBuilder.getTypeface(FONT_NEUTRAL) != null) { - button.setTypeface(mBuilder.getTypeface(FONT_NEUTRAL)); - } - - if (!longAction) { - boolean multiLines = CafeBarUtil.isContentMultiLines(mBuilder); - if (multiLines) { - if (mBuilder.mFitSystemWindow && !mBuilder.mFloating) { - if (tabletMode || configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { - root.setPadding(side, side, (side - buttonPadding), (side + navBar)); - } else { - root.setPadding(side, side, (side - buttonPadding + navBar), side); - } - } else { - root.setPadding(side, side, (side - buttonPadding), side); - } - } - } - - button.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View view) { - if (callback != null) { - callback.OnClick(getCafeBar()); - return; - } - - LogUtil.d("callback = null, CafeBar dismissed"); - dismiss(); - } - }); - - root.addView(button); - } - - - - @NonNull - private CafeBar getCafeBar() { - return this; - } - - @NonNull - public View getView() { - Snackbar.SnackbarLayout snackBarLayout = (Snackbar.SnackbarLayout) mSnackBar.getView(); - - boolean tabletMode = mBuilder.mContext.getResources().getBoolean(R.bool.cafebar_tablet_mode); - - if (tabletMode || mBuilder.mFloating) { - CardView cardView = (CardView) snackBarLayout.getChildAt(0); - return cardView.getChildAt(0); - } - - LinearLayout linearLayout = (LinearLayout) snackBarLayout.getChildAt(0); - if (mBuilder.mShowShadow) return linearLayout.getChildAt(1); - return linearLayout.getChildAt(0); - } - - public void dismiss() { - if (mSnackBar == null) return; - - mSnackBar.dismiss(); - } - - public void show() { - mSnackBar.show(); - - if (mBuilder.mSwipeToDismiss) return; - - if (mSnackBar.getView().getLayoutParams() instanceof CoordinatorLayout.LayoutParams) { - mSnackBar.getView().getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() { - - @Override - public boolean onPreDraw() { - mSnackBar.getView().getViewTreeObserver().removeOnPreDrawListener(this); - ((CoordinatorLayout.LayoutParams) mSnackBar.getView().getLayoutParams()).setBehavior(null); - return true; - } - }); - } - } - - @NonNull - public static Builder builder(@NonNull Context context) { - return new Builder(context); - } - - @SuppressWarnings("unused") - public static class Builder { - - Context mContext; - - @NonNull View mTo; - @Nullable View mCustomView; - CafeBarTheme.Custom mTheme = CafeBarTheme.Custom(CafeBarTheme.DARK.getColor()); - CafeBarGravity mGravity = CafeBarGravity.CENTER; - - @Snackbar.Duration - int mDuration = Snackbar.LENGTH_SHORT; - int mMaxLines = 2; - @ColorInt - int mPositiveColor = mTheme.getTitleColor(); - @ColorInt int mNegativeColor = mTheme.getTitleColor(); - @ColorInt int mNeutralColor = mTheme.getTitleColor(); - - boolean mLongContent = false; - boolean mAutoDismiss = true; - boolean mShowShadow = true; - boolean mFitSystemWindow = false; - boolean mFloating = false; - boolean mTintIcon = true; - boolean mSwipeToDismiss = true; - - private HashMap> mTypefaces; - - @Nullable Drawable mIcon = null; - - String mContent = ""; - @Nullable String mPositiveText = null; - @Nullable String mNegativeText = null; - @Nullable String mNeutralText = null; - - @Nullable SpannableStringBuilder mSpannableBuilder = null; - - @Nullable CafeBarCallback mPositiveCallback; - @Nullable CafeBarCallback mNegativeCallback; - @Nullable CafeBarCallback mNeutralCallback; - - public Builder(@NonNull Context context) { - mContext = context; - mTypefaces = new HashMap<>(); - - mTo = ((Activity) mContext).getWindow().getDecorView() - .findViewById(android.R.id.content); - } - - public Builder to(@Nullable View view) { - if (view != null) { - mTo = view; - return this; - } - - LogUtil.e("to(View): view is null, ignored"); - return this; - } - - public Builder customView(@LayoutRes int res) { - View view = View.inflate(mContext, res, null); - return customView(view); - } - - public Builder customView(@Nullable View customView) { - mCustomView = customView; - return this; - } - - public Builder content(@StringRes int res) { - return content(mContext.getResources().getString(res)); - } - - public Builder content(@NonNull String content) { - mContent = content; - return this; - } - - public Builder content(@NonNull SpannableStringBuilder spannableBuilder) { - mSpannableBuilder = spannableBuilder; - return this; - } - - public Builder maxLines(@IntRange(from = 1, to = 6) int maxLines) { - mMaxLines = maxLines; - return this; - } - - public Builder duration(@Snackbar.Duration int duration) { - mDuration = duration; - return this; - } - - public Builder theme(@NonNull CafeBarTheme theme) { - return theme(CafeBarTheme.Custom(theme.getColor())); - } - - public Builder theme(@NonNull CafeBarTheme.Custom customTheme) { - mTheme = customTheme; - mPositiveColor = mTheme.getTitleColor(); - mNegativeColor = mNeutralColor = mTheme.getSubTitleColor(); - return this; - } - - public Builder icon(@Nullable Bitmap icon) { - return icon(CafeBarUtil.toDrawable(mContext, icon), true); - } - - public Builder icon(@DrawableRes int res) { - return icon(CafeBarUtil.getDrawable(mContext, res), true); - } - - public Builder icon(@Nullable Drawable icon) { - return icon(icon, true); - } - - public Builder icon(@Nullable Bitmap icon, boolean tintIcon) { - return icon(CafeBarUtil.toDrawable(mContext, icon), tintIcon); - } - - public Builder icon(@DrawableRes int res, boolean tintIcon) { - return icon(CafeBarUtil.getDrawable(mContext, res), tintIcon); - } - - public Builder icon(@Nullable Drawable icon, boolean tintIcon) { - mIcon = icon; - mTintIcon = tintIcon; - return this; - } - - public Builder showShadow(@BoolRes int res) { - return showShadow(mContext.getResources().getBoolean(res)); - } - - public Builder showShadow(boolean showShadow) { - mShowShadow = showShadow; - return this; - } - - public Builder autoDismiss(@BoolRes int res) { - return autoDismiss(mContext.getResources().getBoolean(res)); - } - - public Builder autoDismiss(boolean autoDismiss) { - mAutoDismiss = autoDismiss; - return this; - } - - public Builder swipeToDismiss(@BoolRes int res) { - return swipeToDismiss(mContext.getResources().getBoolean(res)); - } - - public Builder swipeToDismiss(boolean swipeToDismiss) { - mSwipeToDismiss = swipeToDismiss; - return this; - } - - public Builder floating(@BoolRes int res) { - return floating(mContext.getResources().getBoolean(res)); - } - - public Builder floating(boolean floating) { - mFloating = floating; - return this; - } - - public Builder gravity(@NonNull CafeBarGravity gravity) { - mGravity = gravity; - return this; - } - - public Builder fitSystemWindow() { - Activity activity = (Activity) mContext; - Window window = activity.getWindow(); - if (window == null) { - LogUtil.d("fitSystemWindow() window is null"); - return this; - } - - WindowManager.LayoutParams params = window.getAttributes(); - int navigationBarHeight = CafeBarUtil.getNavigationBarHeight(mContext); - - boolean isInMultiWindowMode = false; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - isInMultiWindowMode = activity.isInMultiWindowMode(); - } - - if ((params.flags & WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION) == - WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION) { - mFitSystemWindow = navigationBarHeight > 0 && !isInMultiWindowMode; - } - return this; - } - - public Builder typeface(String contentFontName, String buttonFontName) { - return typeface(CafeBarUtil.getTypeface(mContext, contentFontName), - CafeBarUtil.getTypeface(mContext, buttonFontName)); - } - - public Builder typeface(@Nullable Typeface content, @Nullable Typeface button) { - addTypeface(FONT_CONTENT, content); - addTypeface(FONT_POSITIVE, button); - addTypeface(FONT_NEGATIVE, button); - addTypeface(FONT_NEUTRAL, button); - return this; - } - - public Builder contentTypeface(String fontName) { - return contentTypeface(CafeBarUtil.getTypeface(mContext, fontName)); - } - - public Builder contentTypeface(@Nullable Typeface typeface) { - addTypeface(FONT_CONTENT, typeface); - return this; - } - - public Builder positiveTypeface(String fontName) { - return positiveTypeface(CafeBarUtil.getTypeface(mContext, fontName)); - } - - public Builder positiveTypeface(@Nullable Typeface typeface) { - addTypeface(FONT_POSITIVE,typeface); - return this; - } - - public Builder negativeTypeface(String fontName) { - return negativeTypeface(CafeBarUtil.getTypeface(mContext, fontName)); - } - - public Builder negativeTypeface(@Nullable Typeface typeface) { - addTypeface(FONT_NEGATIVE, typeface); - return this; - } - - public Builder neutralTypeface(String fontName) { - return neutralTypeface(CafeBarUtil.getTypeface(mContext, fontName)); - } - - public Builder neutralTypeface(@Nullable Typeface typeface) { - addTypeface(FONT_NEUTRAL, typeface); - return this; - } - - public Builder buttonTypeface(String fontName) { - return buttonTypeface(CafeBarUtil.getTypeface(mContext, fontName)); - } - - public Builder buttonTypeface(@Nullable Typeface typeface) { - addTypeface(FONT_POSITIVE, typeface); - addTypeface(FONT_NEGATIVE, typeface); - addTypeface(FONT_NEUTRAL, typeface); - return this; - } - - public Builder positiveColor(int positiveColor) { - mPositiveColor = CafeBarUtil.getColor(mContext, positiveColor); - return this; - } - - public Builder negativeColor(int negativeColor) { - mNegativeColor = CafeBarUtil.getColor(mContext, negativeColor); - return this; - } - - public Builder neutralColor(int neutralColor) { - mNeutralColor = CafeBarUtil.getColor(mContext, neutralColor); - return this; - } - - public Builder buttonColor(int buttonColor) { - int color = CafeBarUtil.getColor(mContext, buttonColor); - mNeutralColor = mPositiveColor = mNegativeColor = color; - return this; - } - - public Builder positiveText(@StringRes int res) { - return positiveText(mContext.getResources().getString(res)); - } - - public Builder positiveText(@NonNull String positiveText) { - mPositiveText = positiveText; - return this; - } - - public Builder negativeText(@StringRes int res) { - return negativeText(mContext.getResources().getString(res)); - } - - public Builder negativeText(@NonNull String negativeText) { - mNegativeText = negativeText; - return this; - } - - public Builder neutralText(@StringRes int res) { - return neutralText(mContext.getResources().getString(res)); - } - - public Builder neutralText(@NonNull String neutralText) { - mNeutralText = neutralText; - return this; - } - - public Builder onPositive(@Nullable CafeBarCallback positiveCallback) { - mPositiveCallback = positiveCallback; - return this; - } - - public Builder onNegative(@Nullable CafeBarCallback negativeCallback) { - mNegativeCallback = negativeCallback; - return this; - } - - public Builder onNeutral(@Nullable CafeBarCallback neutralCallback) { - mNeutralCallback = neutralCallback; - return this; - } - - public CafeBar build() { - return new CafeBar(this); - } - - public void show() { - build().show(); - } - - private void addTypeface(String name, Typeface typeface) { - if (!mTypefaces.containsKey(name) || mTypefaces.get(name) == null) { - mTypefaces.put(name, new WeakReference<>(typeface)); - } - } - - @Nullable - Typeface getTypeface(String name) { - if (mTypefaces.get(name) != null) { - return mTypefaces.get(name).get(); - } - return null; - } - } -} diff --git a/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarCallback.java b/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarCallback.java deleted file mode 100644 index 4a25749a..00000000 --- a/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarCallback.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.danimahardhika.cafebar; - -/* - * CafeBar - * - * Copyright (c) 2017 Dani Mahardhika - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -import androidx.annotation.NonNull; - -public interface CafeBarCallback { - - void OnClick(@NonNull CafeBar cafeBar); -} diff --git a/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarGravity.java b/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarGravity.java deleted file mode 100644 index 9cd17023..00000000 --- a/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarGravity.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.danimahardhika.cafebar; - -/* - * CafeBar - * - * Copyright (c) 2017 Dani Mahardhika - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -import android.view.Gravity; - -@SuppressWarnings("unused") -public enum CafeBarGravity { - START(Gravity.START), - CENTER(Gravity.CENTER), - END(Gravity.END); - - private int mGravity; - - CafeBarGravity(int gravity) { - mGravity = gravity; - } - - int getGravity() { - return mGravity; - } -} diff --git a/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarTheme.java b/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarTheme.java deleted file mode 100644 index 2ec8f3c8..00000000 --- a/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarTheme.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.danimahardhika.cafebar; - -/* - * CafeBar - * - * Copyright (c) 2017 Dani Mahardhika - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import android.graphics.Color; - -import androidx.annotation.ColorInt; - -@SuppressWarnings("unused") -public enum CafeBarTheme { - - LIGHT(Color.parseColor("#F5F5F5")), - DARK(Color.parseColor("#323232")), - CLEAR_BLACK(Color.BLACK); - - private int mColor; - - CafeBarTheme(@ColorInt int color) { - mColor = color; - } - - @ColorInt - int getColor() { - return mColor; - } - - public static Custom Custom(@ColorInt int color) { - return new Custom(color); - } - - public static class Custom { - - private int mColor; - - private Custom(int color) { - mColor = color; - } - - @ColorInt - int getColor() { - return mColor; - } - - @ColorInt - int getTitleColor() { - return CafeBarUtil.getTitleTextColor(mColor); - } - - @ColorInt - int getSubTitleColor() { - return CafeBarUtil.getSubTitleTextColor(mColor); - } - } -} diff --git a/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarUtil.java b/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarUtil.java deleted file mode 100644 index 7a776342..00000000 --- a/cafebar/src/main/java/com/danimahardhika/cafebar/CafeBarUtil.java +++ /dev/null @@ -1,593 +0,0 @@ -package com.danimahardhika.cafebar; - -/* - * CafeBar - * - * Copyright (c) 2017 Dani Mahardhika - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -import android.app.Activity; -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Point; -import android.graphics.PorterDuff; -import android.graphics.Typeface; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.os.Build; -import android.text.TextUtils; -import android.util.DisplayMetrics; -import android.util.Log; -import android.util.TypedValue; -import android.view.Display; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.view.WindowManager; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.google.android.material.snackbar.Snackbar; - -import java.util.Locale; - -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.cardview.widget.CardView; -import androidx.core.content.ContextCompat; - -class CafeBarUtil { - - @NonNull - static View getBaseCafeBarView(@NonNull CafeBar.Builder builder) { - int color = builder.mTheme.getColor(); - int titleColor = builder.mTheme.getTitleColor(); - - //Creating LinearLayout as rootView - LinearLayout root = new LinearLayout(builder.mContext); - root.setId(R.id.cafebar_root); - root.setOrientation(LinearLayout.HORIZONTAL); - root.setGravity(Gravity.CENTER_VERTICAL); - root.setBackgroundColor(color); - root.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.WRAP_CONTENT)); - root.setClickable(true); - - //Creating TextView for content - TextView content = new TextView(builder.mContext); - content.setId(R.id.cafebar_content); - content.setMaxLines(builder.mMaxLines); - content.setEllipsize(TextUtils.TruncateAt.END); - content.setTextColor(titleColor); - content.setTextSize(TypedValue.COMPLEX_UNIT_PX, builder.mContext.getResources() - .getDimensionPixelSize(R.dimen.cafebar_content_text)); - if (builder.getTypeface(CafeBar.FONT_CONTENT) != null) { - content.setTypeface(builder.getTypeface(CafeBar.FONT_CONTENT)); - } - - content.setText(builder.mContent); - if (builder.mSpannableBuilder != null) { - content.setText(builder.mSpannableBuilder, TextView.BufferType.SPANNABLE); - } - - content.setLayoutParams(new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, - LinearLayout.LayoutParams.WRAP_CONTENT)); - content.setGravity(Gravity.CENTER_VERTICAL); - - boolean tabletMode = builder.mContext.getResources().getBoolean(R.bool.cafebar_tablet_mode); - if (tabletMode || builder.mFloating) { - content.setLayoutParams(new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.WRAP_CONTENT, - LinearLayout.LayoutParams.WRAP_CONTENT)); - content.setMinWidth(builder.mContext.getResources() - .getDimensionPixelSize(R.dimen.cafebar_floating_min_width)); - content.setMaxWidth(builder.mContext.getResources() - .getDimensionPixelSize(R.dimen.cafebar_floating_max_width)); - } - - int side = builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_content_padding_side); - int top = builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_content_padding_top); - - if (builder.mIcon != null) { - Drawable drawable = getResizedDrawable( - builder.mContext, - builder.mIcon, - titleColor, - builder.mTintIcon); - if (drawable != null) { - content.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null); - content.setCompoundDrawablePadding(top); - } - } - - boolean multiLines = isContentMultiLines(builder); - boolean containsPositive = builder.mPositiveText != null; - boolean containsNegative = builder.mNegativeText != null; - boolean longNeutralAction = isLongAction(builder.mNeutralText); - - if (multiLines || containsPositive || containsNegative || longNeutralAction) { - top = side; - builder.mLongContent = true; - } - - root.setPadding(side, top, side, top); - - if (builder.mPositiveText == null && builder.mNegativeText == null) { - if (builder.mFitSystemWindow && !builder.mFloating) { - Configuration configuration = builder.mContext.getResources().getConfiguration(); - int navBar = getNavigationBarHeight(builder.mContext); - - if (tabletMode || configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { - root.setPadding(side, top, side, (top + navBar)); - } else { - root.setPadding(side, top, (side + navBar), top); - } - } - - //Adding childView to rootView - root.addView(content); - - //Returning rootView - return root; - } - - //Change root orientation to vertical - root.setOrientation(LinearLayout.VERTICAL); - - //Creating another linear layout for button container - LinearLayout buttonBase = new LinearLayout(builder.mContext); - buttonBase.setId(R.id.cafebar_button_base); - buttonBase.setOrientation(LinearLayout.HORIZONTAL); - buttonBase.setGravity(Gravity.END); - buttonBase.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.WRAP_CONTENT)); - - //Adding button - String neutralText = builder.mNeutralText; - if (neutralText != null) { - TextView neutral = getActionView(builder, neutralText, builder.mNeutralColor); - neutral.setId(R.id.cafebar_button_neutral); - - if (builder.getTypeface(CafeBar.FONT_NEUTRAL) != null) { - neutral.setTypeface(builder.getTypeface(CafeBar.FONT_NEUTRAL)); - } - - buttonBase.addView(neutral); - } - - String negativeText = builder.mNegativeText; - if (negativeText != null) { - TextView negative = getActionView(builder, negativeText, builder.mNegativeColor); - negative.setId(R.id.cafebar_button_negative); - - LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) negative.getLayoutParams(); - params.setMargins( - params.leftMargin + builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_button_margin), - params.topMargin, - params.rightMargin, - params.bottomMargin); - - if (builder.getTypeface(CafeBar.FONT_NEGATIVE) != null) { - negative.setTypeface(builder.getTypeface(CafeBar.FONT_NEGATIVE)); - } - - buttonBase.addView(negative); - } - - String positiveText = builder.mPositiveText; - if (positiveText != null) { - int positiveColor = CafeBarUtil.getAccentColor(builder.mContext, builder.mPositiveColor); - TextView positive = getActionView(builder, positiveText, positiveColor); - positive.setId(R.id.cafebar_button_positive); - - LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) positive.getLayoutParams(); - params.setMargins( - params.leftMargin + builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_button_margin), - params.topMargin, - params.rightMargin, - params.bottomMargin); - - if (builder.getTypeface(CafeBar.FONT_POSITIVE) != null) { - positive.setTypeface(builder.getTypeface(CafeBar.FONT_POSITIVE)); - } - - buttonBase.addView(positive); - } - - //Adjust padding - int buttonPadding = builder.mContext.getResources().getDimensionPixelSize( - R.dimen.cafebar_button_padding); - root.setPadding(side, top, (side - buttonPadding), (top - buttonPadding)); - - if (builder.mFitSystemWindow && !builder.mFloating) { - Configuration configuration = builder.mContext.getResources().getConfiguration(); - int navBar = getNavigationBarHeight(builder.mContext); - - if (tabletMode || configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { - root.setPadding(side, top, (side - buttonPadding), (top - buttonPadding + navBar)); - } else { - root.setPadding(side, top, (side - buttonPadding + navBar), top); - } - } - - //Adding content to container - content.setPadding(0, 0, buttonPadding, 0); - - //Adding childView to rootView - root.addView(content); - - //Adding button container to root - root.addView(buttonBase); - - //Returning rootView - return root; - } - - static Snackbar getBaseSnackBar(@NonNull View cafeBarLayout, - @NonNull CafeBar.Builder builder) { - View view = builder.mTo; - - Snackbar snackBar = Snackbar.make(view, "", builder.mAutoDismiss ? - builder.mDuration : Snackbar.LENGTH_INDEFINITE); - Snackbar.SnackbarLayout snackBarLayout = (Snackbar.SnackbarLayout) snackBar.getView(); - snackBarLayout.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT; - snackBarLayout.setPadding(0, 0, 0, 0); - snackBarLayout.setBackgroundColor(Color.TRANSPARENT); - snackBarLayout.setClickable(false); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - snackBarLayout.setElevation(0); - } - - TextView textView = snackBarLayout.findViewById( - R.id.snackbar_text); - if (textView != null) textView.setVisibility(View.INVISIBLE); - - boolean tabletMode = builder.mContext.getResources().getBoolean(R.bool.cafebar_tablet_mode); - if (tabletMode || builder.mFloating) { - int shadow = builder.mContext.getResources().getDimensionPixelSize(R.dimen.cardview_default_elevation); - int padding = builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_floating_padding); - - CardView cardView = new CardView(builder.mContext); - cardView.setUseCompatPadding(false); - Snackbar.SnackbarLayout.LayoutParams params = new Snackbar.SnackbarLayout.LayoutParams( - LinearLayout.LayoutParams.WRAP_CONTENT, - LinearLayout.LayoutParams.WRAP_CONTENT); - params.gravity = builder.mGravity.getGravity(); - - int bottom = builder.mFloating ? padding : 0; - snackBarLayout.setClipToPadding(false); - snackBarLayout.setPadding(padding, shadow, padding, bottom); - - if (builder.mFitSystemWindow && builder.mFloating) { - Configuration configuration = builder.mContext.getResources().getConfiguration(); - int navBar = getNavigationBarHeight(builder.mContext); - - if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT) { - snackBarLayout.setPadding(padding, shadow, padding, bottom + navBar); - } else { - snackBarLayout.setPadding(padding, shadow, padding + navBar, bottom); - } - } - - cardView.setLayoutParams(params); - cardView.setClickable(true); - if (!builder.mShowShadow) { - cardView.setCardElevation(0f); - } - - cardView.addView(cafeBarLayout); - snackBarLayout.addView(cardView, 0); - return snackBar; - } - - LinearLayout root = new LinearLayout(builder.mContext); - root.setOrientation(LinearLayout.VERTICAL); - root.setLayoutParams(new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.MATCH_PARENT, - LinearLayout.LayoutParams.WRAP_CONTENT)); - - if (builder.mShowShadow) { - View shadow = new View(builder.mContext); - shadow.setLayoutParams(new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - builder.mContext.getResources().getDimensionPixelSize( - R.dimen.cafebar_shadow_top))); - shadow.setBackgroundResource(R.drawable.cafebar_shadow_top); - root.addView(shadow); - } - - root.addView(cafeBarLayout); - snackBarLayout.addView(root, 0); - return snackBar; - } - - @NonNull - static TextView getActionView(@NonNull CafeBar.Builder builder, @NonNull String action, int color) { - boolean longAction = isLongAction(action); - int res = R.layout.cafebar_action_button_dark; - - CafeBarTheme.Custom customTheme = builder.mTheme; - int titleColor = customTheme.getTitleColor(); - boolean dark = titleColor != Color.WHITE; - if (dark) { - res = R.layout.cafebar_action_button; - } - - int padding = builder.mContext.getResources().getDimensionPixelSize( - R.dimen.cafebar_button_padding); - - TextView button = (TextView) View.inflate(builder.mContext, res, null); - button.setText(action.toUpperCase(Locale.getDefault())); - button.setMaxLines(1); - button.setEllipsize(TextUtils.TruncateAt.END); - button.setTextColor(color); - button.setPadding(padding, padding, padding, padding); - - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( - LinearLayout.LayoutParams.WRAP_CONTENT, - LinearLayout.LayoutParams.WRAP_CONTENT); - - int side = builder.mContext.getResources().getDimensionPixelSize( - R.dimen.cafebar_content_padding_side); - int margin = builder.mContext.getResources().getDimensionPixelSize( - R.dimen.cafebar_button_margin_start); - params.setMargins(margin, 0, 0, 0); - - if (longAction) { - params.setMargins(0, (side - padding), 0, 0); - } - - if (builder.mPositiveText != null || builder.mNegativeText != null) { - longAction = true; - params.setMargins(0, (side - padding), 0, 0); - } else { - params.gravity = Gravity.CENTER_VERTICAL | Gravity.END; - } - - button.setLayoutParams(params); - - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - button.setBackgroundResource(dark ? R.drawable.cafebar_action_button_selector_dark : - R.drawable.cafebar_action_button_selector); - return button; - } - - TypedValue outValue = new TypedValue(); - builder.mContext.getTheme().resolveAttribute(longAction ? - R.attr.selectableItemBackground : R.attr.selectableItemBackgroundBorderless, - outValue, true); - button.setBackgroundResource(outValue.resourceId); - return button; - } - - static boolean isContentMultiLines(@NonNull CafeBar.Builder builder) { - DisplayMetrics metrics = new DisplayMetrics(); - ((Activity) builder.mContext).getWindowManager().getDefaultDisplay().getMetrics(metrics); - - boolean tabletMode = builder.mContext.getResources().getBoolean(R.bool.cafebar_tablet_mode); - int padding = (builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_content_padding_side) * 2); - - if (builder.mNeutralText != null && builder.mNegativeText == null && builder.mPositiveText == null && - !isLongAction(builder.mNeutralText)) { - padding += builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_button_margin_start); - - int actionPadding = builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_button_padding); - TextView action = new TextView(builder.mContext); - action.setTextSize(TypedValue.COMPLEX_UNIT_PX, builder.mContext.getResources() - .getDimensionPixelSize(R.dimen.cafebar_content_text)); - if (builder.getTypeface(CafeBar.FONT_NEUTRAL) != null) { - action.setTypeface(builder.getTypeface(CafeBar.FONT_CONTENT)); - } - action.setPadding(actionPadding, 0, actionPadding, 0); - action.setText(builder.mNeutralText.substring(0, - builder.mNeutralText.length() > 10 ? 10 : builder.mNeutralText.length())); - - int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(metrics.widthPixels, View.MeasureSpec.AT_MOST); - int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); - action.measure(widthMeasureSpec, heightMeasureSpec); - - LogUtil.d("measured action width: " +action.getMeasuredWidth()); - padding += action.getMeasuredWidth(); - } - - if (builder.mIcon != null) { - int icon = builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_icon_size); - icon += builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_content_padding_top); - padding += icon; - } - - TextView textView = new TextView(builder.mContext); - textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, builder.mContext.getResources() - .getDimension(R.dimen.cafebar_content_text)); - textView.setPadding(padding, 0, 0, 0); - if (builder.getTypeface(CafeBar.FONT_CONTENT) != null) { - textView.setTypeface(builder.getTypeface(CafeBar.FONT_CONTENT)); - } - - if (builder.mSpannableBuilder != null) { - textView.setText(builder.mSpannableBuilder, TextView.BufferType.SPANNABLE); - } else { - textView.setText(builder.mContent); - } - - int maxWidth = metrics.widthPixels; - if (builder.mFloating || tabletMode) { - maxWidth = builder.mContext.getResources().getDimensionPixelSize(R.dimen.cafebar_floating_max_width); - } - - int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(maxWidth, View.MeasureSpec.AT_MOST); - int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); - textView.measure(widthMeasureSpec, heightMeasureSpec); - return textView.getLineCount() > 1; - } - - @Nullable - static Drawable getDrawable(@NonNull Context context, @DrawableRes int res) { - try { - Drawable drawable = context.getResources().getDrawable(res); - return drawable.mutate(); - } catch (OutOfMemoryError e) { - return null; - } - } - - @Nullable - static Drawable toDrawable(@NonNull Context context, @Nullable Bitmap bitmap) { - try { - if (bitmap == null) return null; - return new BitmapDrawable(context.getResources(), bitmap); - } catch (OutOfMemoryError e) { - return null; - } - } - - @Nullable - private static Drawable getResizedDrawable(@NonNull Context context, @Nullable Drawable drawable, - int color, boolean tint) { - try { - if (drawable == null) { - LogUtil.d("drawable: null"); - return null; - } - - if (tint) { - drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN); - drawable.mutate(); - } - - int size = context.getResources().getDimensionPixelSize(R.dimen.cafebar_icon_size); - Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), - drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(bitmap); - drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); - drawable.draw(canvas); - - return new BitmapDrawable(context.getResources(), - Bitmap.createScaledBitmap(bitmap, size, size, true)); - } catch (Exception | OutOfMemoryError e) { - LogUtil.e(Log.getStackTraceString(e)); - return null; - } - } - - static int getNavigationBarHeight(@NonNull Context context) { - Point appUsableSize = getAppUsableScreenSize(context); - Point realScreenSize = getRealScreenSize(context); - - if (appUsableSize.x < realScreenSize.x) { - Point point = new Point(realScreenSize.x - appUsableSize.x, appUsableSize.y); - return point.x; - } - - if (appUsableSize.y < realScreenSize.y) { - Point point = new Point(appUsableSize.x, realScreenSize.y - appUsableSize.y); - return point.y; - } - return 0; - } - - private static Point getAppUsableScreenSize(@NonNull Context context) { - WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); - Display display = windowManager.getDefaultDisplay(); - Point size = new Point(); - display.getSize(size); - return size; - } - - private static Point getRealScreenSize(@NonNull Context context) { - WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); - Display display = windowManager.getDefaultDisplay(); - Point size = new Point(); - - if (Build.VERSION.SDK_INT >= 17) { - display.getRealSize(size); - } else if (Build.VERSION.SDK_INT >= 14) { - try { - size.x = (Integer) Display.class.getMethod("getRawWidth").invoke(display); - size.y = (Integer) Display.class.getMethod("getRawHeight").invoke(display); - } catch (Exception e) { - LogUtil.e(Log.getStackTraceString(e)); - } - } - return size; - } - - static boolean isLongAction(@Nullable String action) { - return action != null && action.length() > 10; - } - - static int getAccentColor(Context context, int defaultColor) { - if (context == null) { - LogUtil.e("getAccentColor() context is null"); - return defaultColor; - } - - TypedValue typedValue = new TypedValue(); - Resources.Theme theme = context.getTheme(); - theme.resolveAttribute(R.attr.colorAccent, typedValue, true); - return typedValue.data; - } - - static int getTitleTextColor(@ColorInt int color) { - double darkness = 1-(0.299*Color.red(color) + 0.587*Color.green(color) + 0.114*Color.blue(color))/255; - return (darkness < 0.35) ? getDarkerColor(color) : Color.WHITE; - } - - static int getSubTitleTextColor(@ColorInt int color) { - int titleColor = getTitleTextColor(color); - int alpha2 = Math.round(Color.alpha(titleColor) * 0.7f); - int red = Color.red(titleColor); - int green = Color.green(titleColor); - int blue = Color.blue(titleColor); - return Color.argb(alpha2, red, green, blue); - } - - private static int getDarkerColor(@ColorInt int color) { - float[] hsv = new float[3]; - Color.colorToHSV(color, hsv); - hsv[2] *= 0.25f; - return Color.HSVToColor(hsv); - } - - static int getColor(@NonNull Context context, int color) { - try { - return ContextCompat.getColor(context, color); - } catch (Exception e) { - LogUtil.e(Log.getStackTraceString(e)); - return color; - } - } - - @Nullable - static Typeface getTypeface(@NonNull Context context, String fontName) { - try { - return Typeface.createFromAsset(context.getAssets(), "fonts/" +fontName); - } catch (Exception e) { - LogUtil.e(Log.getStackTraceString(e)); - } - return null; - } -} diff --git a/cafebar/src/main/java/com/danimahardhika/cafebar/LogUtil.java b/cafebar/src/main/java/com/danimahardhika/cafebar/LogUtil.java deleted file mode 100644 index 6a0aad64..00000000 --- a/cafebar/src/main/java/com/danimahardhika/cafebar/LogUtil.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.danimahardhika.cafebar; - -/* - * CafeBar - * - * Copyright (c) 2017 Dani Mahardhika - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import android.util.Log; - -import androidx.annotation.NonNull; - -class LogUtil { - - static boolean sEnableLogging = false; - - private static final String TAG = "CafeBar"; - - static void d(@NonNull String message) { - if (LogUtil.sEnableLogging) - Log.d(TAG, message); - } - - static void e(@NonNull String message) { - if (LogUtil.sEnableLogging) - Log.e(TAG, message); - } -} diff --git a/cafebar/src/main/res-public/values/public.xml b/cafebar/src/main/res-public/values/public.xml deleted file mode 100644 index 4705295e..00000000 --- a/cafebar/src/main/res-public/values/public.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/cafebar/src/main/res/drawable/cafebar_action_button_selector.xml b/cafebar/src/main/res/drawable/cafebar_action_button_selector.xml deleted file mode 100644 index ebca92b2..00000000 --- a/cafebar/src/main/res/drawable/cafebar_action_button_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/cafebar/src/main/res/drawable/cafebar_action_button_selector_dark.xml b/cafebar/src/main/res/drawable/cafebar_action_button_selector_dark.xml deleted file mode 100644 index 075d3975..00000000 --- a/cafebar/src/main/res/drawable/cafebar_action_button_selector_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/cafebar/src/main/res/drawable/cafebar_shadow_top.xml b/cafebar/src/main/res/drawable/cafebar_shadow_top.xml deleted file mode 100644 index eb6c9068..00000000 --- a/cafebar/src/main/res/drawable/cafebar_shadow_top.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/cafebar/src/main/res/layout/cafebar_action_button.xml b/cafebar/src/main/res/layout/cafebar_action_button.xml deleted file mode 100644 index 6f21978d..00000000 --- a/cafebar/src/main/res/layout/cafebar_action_button.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - \ No newline at end of file diff --git a/cafebar/src/main/res/layout/cafebar_action_button_dark.xml b/cafebar/src/main/res/layout/cafebar_action_button_dark.xml deleted file mode 100644 index 888a548d..00000000 --- a/cafebar/src/main/res/layout/cafebar_action_button_dark.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - \ No newline at end of file diff --git a/cafebar/src/main/res/values-sw600dp-land/dimens.xml b/cafebar/src/main/res/values-sw600dp-land/dimens.xml deleted file mode 100644 index 5799a6b2..00000000 --- a/cafebar/src/main/res/values-sw600dp-land/dimens.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 288dp - - \ No newline at end of file diff --git a/cafebar/src/main/res/values-sw600dp/bools.xml b/cafebar/src/main/res/values-sw600dp/bools.xml deleted file mode 100644 index c203d3be..00000000 --- a/cafebar/src/main/res/values-sw600dp/bools.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - true - - \ No newline at end of file diff --git a/cafebar/src/main/res/values-sw600dp/dimens.xml b/cafebar/src/main/res/values-sw600dp/dimens.xml deleted file mode 100644 index a9a49daf..00000000 --- a/cafebar/src/main/res/values-sw600dp/dimens.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - 48dp - - - 188dp - 568dp - 24dp - - \ No newline at end of file diff --git a/cafebar/src/main/res/values/bools.xml b/cafebar/src/main/res/values/bools.xml deleted file mode 100644 index 944cf2a0..00000000 --- a/cafebar/src/main/res/values/bools.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - false - - \ No newline at end of file diff --git a/cafebar/src/main/res/values/colors.xml b/cafebar/src/main/res/values/colors.xml deleted file mode 100644 index eac88795..00000000 --- a/cafebar/src/main/res/values/colors.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - #44000000 - #44FFFFFF - - \ No newline at end of file diff --git a/cafebar/src/main/res/values/dimens.xml b/cafebar/src/main/res/values/dimens.xml deleted file mode 100644 index 6082bac0..00000000 --- a/cafebar/src/main/res/values/dimens.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - 24dp - - 24dp - 14dp - - 24dp - 10dp - 8dp - - 4dp - 14sp - - - 108dp - 368dp - 16dp - - \ No newline at end of file diff --git a/cafebar/src/main/res/values/ids.xml b/cafebar/src/main/res/values/ids.xml deleted file mode 100644 index c5bb9f24..00000000 --- a/cafebar/src/main/res/values/ids.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cafebar/src/main/res/values/styles.xml b/cafebar/src/main/res/values/styles.xml deleted file mode 100644 index 2d8c8ae4..00000000 --- a/cafebar/src/main/res/values/styles.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 13fc0f92..8de50581 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,6 @@ android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m -android.enableR8=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 49736658..80cea62c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Dec 06 18:23:03 CET 2019 +#Wed Feb 17 14:04:38 CET 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/material-about-library/build.gradle b/material-about-library/build.gradle deleted file mode 100644 index 8ff2c558..00000000 --- a/material-about-library/build.gradle +++ /dev/null @@ -1,38 +0,0 @@ -apply plugin: 'com.android.library' - -group = 'com.github.daniel-stoneuk' - -def versionMajor = 2 -def versionMinor = 3 -def versionPatch = 0 -def versionBuild = 0 // bump for dogfood builds, public betas, etc. - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - - defaultConfig { - minSdkVersion 14 - targetSdkVersion rootProject.ext.targetSdkVersion - versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild - versionName "${versionMajor}.${versionMinor}" + (versionPatch == 0 ? "" : ".${versionPatch}") - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - debugMinify { - debuggable = true - minifyEnabled = true - proguardFiles 'proguard-android.txt' - } - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "androidx.appcompat:appcompat:${androidXAppCompat}" - implementation "androidx.cardview:cardview:${androidXCardView}" - implementation "com.google.android.material:material:${googleMaterial}" -} diff --git a/material-about-library/src/main/AndroidManifest.xml b/material-about-library/src/main/AndroidManifest.xml deleted file mode 100644 index 71d1ecd9..00000000 --- a/material-about-library/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/ConvenienceBuilder.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/ConvenienceBuilder.java deleted file mode 100644 index f0e17e95..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/ConvenienceBuilder.java +++ /dev/null @@ -1,357 +0,0 @@ -package com.danielstone.materialaboutlibrary; - -import android.content.ActivityNotFoundException; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.graphics.drawable.Drawable; -import android.net.Uri; -import android.os.Build; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; -import android.webkit.WebView; -import android.widget.Toast; - -import com.danielstone.materialaboutlibrary.items.MaterialAboutActionItem; -import com.danielstone.materialaboutlibrary.items.MaterialAboutItemOnClickAction; -import com.danielstone.materialaboutlibrary.items.MaterialAboutTitleItem; -import com.danielstone.materialaboutlibrary.model.MaterialAboutCard; -import com.danielstone.materialaboutlibrary.util.OpenSourceLicense; - -@SuppressWarnings("JavaDoc") -public class ConvenienceBuilder { - - public static MaterialAboutTitleItem createAppTitleItem(String appName, Drawable applicationIcon) { - return new MaterialAboutTitleItem(appName, null, applicationIcon); - } - - public static MaterialAboutTitleItem createAppTitleItem(Context c) { - Context applicationContext = c.getApplicationContext(); - PackageManager packageManager = applicationContext.getPackageManager(); - ApplicationInfo applicationInfo = applicationContext.getApplicationInfo(); - CharSequence appName = packageManager.getApplicationLabel(applicationInfo); - Drawable applicationIcon = packageManager.getApplicationIcon(applicationInfo); - return createAppTitleItem(appName == null ? "" : appName.toString(), applicationIcon); - } - - /** - * Creates an item with version info read from the PackageManager for current application. - * - * @param c context - * @param icon - * @param text - * @param includeVersionCode - * @return Item to add to card. - */ - public static MaterialAboutActionItem createVersionActionItem(Context c, Drawable icon, CharSequence text, boolean includeVersionCode) { - String versionName = ""; - int versionCode = 0; - try { - PackageInfo pInfo = c.getPackageManager().getPackageInfo(c.getPackageName(), 0); - versionName = pInfo.versionName; - versionCode = pInfo.versionCode; - } catch (PackageManager.NameNotFoundException ignored) { - // This shouldn't happen. - } - return new MaterialAboutActionItem.Builder() - .text(text) - .subText(versionName + (includeVersionCode ? " (" + versionCode + ")" : "")) - .icon(icon) - .build(); - } - - public static MaterialAboutItemOnClickAction createWebViewDialogOnClickAction(final Context c, final CharSequence dialogTitle, final String htmlString, final boolean isStringUrl, final boolean supportZoom) { - return createWebViewDialogOnClickAction(c, dialogTitle, c.getString(R.string.mal_close), htmlString, isStringUrl, supportZoom); - } - - public static MaterialAboutItemOnClickAction createWebViewDialogOnClickAction(final Context c, final CharSequence dialogTitle, final CharSequence dialogNegativeButton, final String htmlString, final boolean isStringUrl, final boolean supportZoom) { - - return new MaterialAboutItemOnClickAction() { - @Override - public void onClick() { - AlertDialog.Builder alertBuilder = new AlertDialog.Builder(c); - alertBuilder.setTitle(dialogTitle); - - final WebView wv = new WebView(c); - wv.getSettings().setSupportZoom(supportZoom); - if (!supportZoom) { - wv.getSettings().setLoadWithOverviewMode(true); - wv.getSettings().setUseWideViewPort(true); - } - if (isStringUrl) { - wv.loadUrl(htmlString); - } else { - wv.loadData(htmlString, "text/html; charset=utf-8", "UTF-8"); - } - - alertBuilder.setView(wv); - alertBuilder.setNegativeButton(dialogNegativeButton, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int id) { - wv.destroy(); - dialog.dismiss(); - } - }); - - final AlertDialog dialog = alertBuilder.create(); - dialog.show(); - } - }; - } - - - public static MaterialAboutActionItem createWebViewDialogItem(Context c, Drawable icon, CharSequence text, @Nullable CharSequence subText, CharSequence dialogTitle, String htmlString, boolean isStringUrl, boolean supportZoom) { - return createWebViewDialogItem(c, icon, text, subText, dialogTitle, c.getString(R.string.mal_close), htmlString, isStringUrl, supportZoom); - } - - public static MaterialAboutActionItem createWebViewDialogItem(Context c, Drawable icon, CharSequence text, @Nullable CharSequence subText, CharSequence dialogTitle, CharSequence dialogNegativeButton, String htmlString, boolean isStringUrl, boolean supportZoom) { - return new MaterialAboutActionItem.Builder() - .text(text) - .subText(subText) - .icon(icon) - .setOnClickAction(createWebViewDialogOnClickAction(c, dialogTitle, dialogNegativeButton, htmlString, isStringUrl, supportZoom)) - .build(); - } - - - public static MaterialAboutItemOnClickAction createWebsiteOnClickAction(final Context c, final Uri websiteUrl) { - return new MaterialAboutItemOnClickAction() { - @Override - public void onClick() { - Intent i = new Intent(Intent.ACTION_VIEW); - i.setData(websiteUrl); - try { - c.startActivity(i); - } catch (Exception e) { - // No activity to handle intent - Toast.makeText(c, R.string.mal_activity_exception, Toast.LENGTH_SHORT).show(); - } - } - }; - } - - /** - * Creates an ActionItem which will open a url when tapped - * - * @param c context - * @param text - * @param icon - * @param websiteUrl (subText) - * @return Item to add to card. - */ - public static MaterialAboutActionItem createWebsiteActionItem(Context c, Drawable icon, CharSequence text, boolean showAddress, final Uri websiteUrl) { - return new MaterialAboutActionItem.Builder() - .text(text) - .subText((showAddress ? websiteUrl.toString() : null)) - .icon(icon) - .setOnClickAction(createWebsiteOnClickAction(c, websiteUrl)) - .build(); - } - - /** - * Creates a MaterialAboutItemOnClickAction that will open - * the Google Play store listing for the app. - * - * @param c context - * @return onClickAction - */ - public static MaterialAboutItemOnClickAction createRateOnClickAction(final Context c) { - Uri uri = Uri.parse("market://details?id=" + c.getPackageName()); - final Intent goToMarket = new Intent(Intent.ACTION_VIEW, uri); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - goToMarket.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | - Intent.FLAG_ACTIVITY_NEW_DOCUMENT | - Intent.FLAG_ACTIVITY_MULTIPLE_TASK); - } else { - goToMarket.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | - Intent.FLAG_ACTIVITY_MULTIPLE_TASK); - } - - return new MaterialAboutItemOnClickAction() { - @Override - public void onClick() { - try { - c.startActivity(goToMarket); - } catch (ActivityNotFoundException e) { - c.startActivity(new Intent(Intent.ACTION_VIEW, - Uri.parse("http://play.google.com/store/apps/details?id=" + c.getPackageName()))); - } - } - }; - } - - /** - * Creates an ActionItem which will open the play store when tapped - * - * @param c context - * @param text - * @param subText - * @param icon - * @return Item to add to card. - */ - public static MaterialAboutActionItem createRateActionItem(Context c, Drawable icon, CharSequence text, @Nullable CharSequence subText) { - - return new MaterialAboutActionItem.Builder() - .text(text) - .subText(subText) - .icon(icon) - .setOnClickAction(createRateOnClickAction(c)) - .build(); - } - - public static MaterialAboutItemOnClickAction createEmailOnClickAction(final Context c, String email, String emailSubject) { - return createEmailOnClickAction(c, email, emailSubject, c.getString(R.string.mal_send_email)); - } - - /** - * Creates a MaterialAboutItemOnClickAction that will open - * an email intent with specified address. - * - * @param c context - * @param email email address - * @return onClickAction - */ - public static MaterialAboutItemOnClickAction createEmailOnClickAction(final Context c, String email, String emailSubject, final CharSequence chooserTitle) { - - final Intent emailIntent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + email)); - emailIntent.putExtra(Intent.EXTRA_SUBJECT, emailSubject); - - return new MaterialAboutItemOnClickAction() { - @Override - public void onClick() { - try { - c.startActivity(Intent.createChooser(emailIntent, chooserTitle)); - } catch (Exception e) { - // No activity to handle intent - Toast.makeText(c, R.string.mal_activity_exception, Toast.LENGTH_SHORT).show(); - } - } - }; - } - - /** - * Creates an ActionItem which will open the an email intent when tapped - * - * @param c context - * @param text - * @param icon - * @param email email address (also used as subText) - * @return Item to add to card. - */ - public static MaterialAboutActionItem createEmailItem(Context c, Drawable icon, CharSequence text, boolean showEmail, String email, String emailSubject, CharSequence chooserTitle) { - return new MaterialAboutActionItem.Builder() - .text(text) - .subText((showEmail ? email : null)) - .icon(icon) - .setOnClickAction(createEmailOnClickAction(c, email, emailSubject, chooserTitle)) - .build(); - } - - public static MaterialAboutActionItem createEmailItem(Context c, Drawable icon, CharSequence text, boolean showEmail, String email, String emailSubject) { - return createEmailItem(c, icon, text, showEmail, email, emailSubject, c.getString(R.string.mal_send_email)); - } - - /** - * Creates a MaterialAboutItemOnClickAction that will open - * the dialer with specified number. - * - * @param c context - * @param number phone number - * @return onClickAction - */ - public static MaterialAboutItemOnClickAction createPhoneOnClickAction(final Context c, String number) { - final Intent phoneIntent = new Intent(Intent.ACTION_DIAL); - phoneIntent.setData(Uri.parse("tel:" + number)); - - return new MaterialAboutItemOnClickAction() { - @Override - public void onClick() { - try { - c.startActivity(phoneIntent); - } catch (Exception e) { - // No activity to handle intent - Toast.makeText(c, R.string.mal_activity_exception, Toast.LENGTH_SHORT).show(); - } - } - }; - } - - /** - * Creates an ActionItem which will open the dialer when tapped - * - * @param c context - * @param text - * @param icon - * @param number phone number (also used as subText) - * @return Item to add to card. - */ - public static MaterialAboutActionItem createPhoneItem(Context c, Drawable icon, CharSequence text, boolean showNumber, String number) { - return new MaterialAboutActionItem.Builder() - .text(text) - .subText((showNumber ? number : null)) - .icon(icon) - .setOnClickAction(createPhoneOnClickAction(c, number)) - .build(); - } - - /** - * Creates a MaterialAboutItemOnClickAction that will open - * maps with a query. - * Query can be either lat,lng(label) or written address - * - * @param c context - * @param addressQuery address query - * @return onClickAction - */ - public static MaterialAboutItemOnClickAction createMapOnClickAction(final Context c, String addressQuery) { - final Intent mapIntent = new Intent(Intent.ACTION_VIEW); - mapIntent.setData(Uri.parse("geo:0,0").buildUpon().appendQueryParameter("q", addressQuery).build()); - return new MaterialAboutItemOnClickAction() { - @Override - public void onClick() { - try { - c.startActivity(mapIntent); - } catch (Exception e) { - // No activity to handle intent - Toast.makeText(c, R.string.mal_activity_exception, Toast.LENGTH_SHORT).show(); - } - } - }; - } - - /** - * Creates an ActionItem which will open maps when tapped - * Query can be either lat,lng(label) or written address - * - * @param c context - * @param text - * @param subText can be set to null - * @param icon - * @param addressQuery addressQuery - * @return Item to add to card. - */ - public static MaterialAboutActionItem createMapItem(Context c, Drawable icon, CharSequence text, CharSequence subText, String addressQuery) { - return new MaterialAboutActionItem.Builder() - .text(text) - .subText(subText) - .icon(icon) - .setOnClickAction(createMapOnClickAction(c, addressQuery)) - .build(); - } - - public static MaterialAboutCard createLicenseCard(Context c, Drawable icon, CharSequence libraryTitle, CharSequence year, CharSequence name, OpenSourceLicense license) { - - MaterialAboutActionItem licenseItem = new MaterialAboutActionItem.Builder() - .icon(icon) - .setIconGravity(MaterialAboutActionItem.GRAVITY_TOP) - .text(libraryTitle) - .subText(String.format(c.getString(license.getResourceId()), year, name)) - .build(); - - return new MaterialAboutCard.Builder().addItem(licenseItem).build(); - } - -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/MaterialAboutActivity.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/MaterialAboutActivity.java deleted file mode 100644 index 9a5ec841..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/MaterialAboutActivity.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.danielstone.materialaboutlibrary; - - -import android.content.Context; -import android.os.AsyncTask; -import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.appbar.AppBarLayout; -import androidx.interpolator.view.animation.FastOutSlowInInterpolator; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.SimpleItemAnimator; -import androidx.appcompat.widget.Toolbar; -import android.util.TypedValue; -import android.view.MenuItem; - -import com.danielstone.materialaboutlibrary.adapters.MaterialAboutListAdapter; -import com.danielstone.materialaboutlibrary.model.MaterialAboutList; -import com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager; -import com.danielstone.materialaboutlibrary.util.ViewTypeManager; - -import java.lang.ref.WeakReference; - -public abstract class MaterialAboutActivity extends AppCompatActivity { - - private MaterialAboutList list = new MaterialAboutList.Builder().build(); - private Toolbar toolbar; - private RecyclerView recyclerView; - private MaterialAboutListAdapter adapter; - - @NonNull - protected abstract MaterialAboutList getMaterialAboutList(@NonNull Context context); - - @Nullable - protected abstract CharSequence getActivityTitle(); - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - verifyAttributesExist(); - - setContentView(R.layout.mal_material_about_activity); - - CharSequence title = getActivityTitle(); - if (title == null) - setTitle(R.string.mal_title_about); - else - setTitle(title); - - - assignViews(); - initViews(); - - ListTask task = new ListTask(this); - task.execute(); - } - - private void verifyAttributesExist() { - TypedValue typedValue = new TypedValue(); - boolean malColorPrimaryExists = - getTheme().resolveAttribute(R.attr.mal_color_primary, typedValue, true); - boolean malColorSecondaryExists = - getTheme().resolveAttribute(R.attr.mal_color_secondary, typedValue, true); - if (!malColorPrimaryExists || !malColorSecondaryExists) { - throw new IllegalStateException(String.format("The current theme doesn't provide %s " + - "and/or %s. Please use a theme provided by the library or an extension.", - getResources().getResourceEntryName(R.attr.mal_color_primary), - getResources().getResourceEntryName(R.attr.mal_color_secondary))); - } - } - - private void assignViews() { - toolbar = (Toolbar) findViewById(R.id.mal_toolbar); - recyclerView = (RecyclerView) findViewById(R.id.mal_recyclerview); - recyclerView.setAlpha(0f); - recyclerView.setTranslationY(20); - } - - private void initViews() { - setSupportActionBar(toolbar); - ActionBar actionBar = getSupportActionBar(); - if (actionBar != null) { - actionBar.setDisplayHomeAsUpEnabled(true); - } - adapter = new MaterialAboutListAdapter(getViewTypeManager()); - recyclerView.setLayoutManager(new LinearLayoutManager(this)); - recyclerView.setAdapter(adapter); - RecyclerView.ItemAnimator animator = recyclerView.getItemAnimator(); - if (animator instanceof SimpleItemAnimator) { - ((SimpleItemAnimator) animator).setSupportsChangeAnimations(false); - } - } - - @NonNull - protected ViewTypeManager getViewTypeManager() { - return new DefaultViewTypeManager(); - } - - @NonNull - protected MaterialAboutList getList() { - return list; - } - - protected boolean shouldAnimate() { - return true; - } - - protected void refreshMaterialAboutList() { - setMaterialAboutList(list); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { - onBackPressed(); - return true; - } - return super.onOptionsItemSelected(item); - } - - private void onTaskFinished(@Nullable MaterialAboutList materialAboutList) { - if (materialAboutList != null) { - list = materialAboutList; - adapter.setData(list.getCards()); - - if (shouldAnimate()) { - recyclerView.animate() - .alpha(1f) - .translationY(0f) - .setDuration(600) - .setInterpolator(new FastOutSlowInInterpolator()).start(); - } else { - recyclerView.setAlpha(1f); - recyclerView.setTranslationY(0f); - } - } else { - finish();//?? why we remain here anyway? - } - } - - protected void setMaterialAboutList(MaterialAboutList materialAboutList) { - list = materialAboutList; - adapter.setData(list.getCards()); - } - - protected void setScrollToolbar(boolean scrollToolbar) { - if (toolbar != null) { - AppBarLayout.LayoutParams params = - (AppBarLayout.LayoutParams) toolbar.getLayoutParams(); - if (scrollToolbar) { - params.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL - | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS); - } else { - params.setScrollFlags(0); - } - } - } - - private static class ListTask extends AsyncTask { - - private WeakReference context; - - ListTask(MaterialAboutActivity context) { - this.context = new WeakReference<>(context); - } - - @Override - protected MaterialAboutList doInBackground(String... params) { - return isCancelled() || context.get() == null ? null : context.get().getMaterialAboutList(context.get()); - } - - @Override - protected void onPostExecute(MaterialAboutList materialAboutList) { - super.onPostExecute(materialAboutList); - if (context.get() != null) { - if (!context.get().isFinishing()) { - context.get().onTaskFinished(materialAboutList); - } - } - context = null; - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/MaterialAboutFragment.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/MaterialAboutFragment.java deleted file mode 100644 index c3ad1f04..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/MaterialAboutFragment.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.danielstone.materialaboutlibrary; - -import android.content.Context; -import android.os.AsyncTask; -import android.os.Bundle; - -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.interpolator.view.animation.FastOutSlowInInterpolator; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.SimpleItemAnimator; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.danielstone.materialaboutlibrary.adapters.MaterialAboutListAdapter; -import com.danielstone.materialaboutlibrary.model.MaterialAboutList; -import com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager; -import com.danielstone.materialaboutlibrary.util.ViewTypeManager; - -public abstract class MaterialAboutFragment extends Fragment { - - private MaterialAboutList list = new MaterialAboutList.Builder().build(); - private RecyclerView recyclerView; - private MaterialAboutListAdapter adapter; - - public static MaterialAboutFragment newInstance(MaterialAboutFragment fragment) { - return fragment; - } - - protected abstract MaterialAboutList getMaterialAboutList(Context activityContext); - - protected int getTheme() { - return R.style.Theme_Mal_Light; - } - - protected boolean shouldAnimate() { - return true; - } - - - @Nullable - @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - int style = getTheme(); - - // create ContextThemeWrapper from the original Activity Context with the custom theme - final Context contextThemeWrapper = new android.view.ContextThemeWrapper(getActivity(), style); - LayoutInflater localInflater = inflater.cloneInContext(contextThemeWrapper); - View rootView = localInflater.inflate(R.layout.mal_material_about_fragment, container, false); - - recyclerView = (RecyclerView) rootView.findViewById(R.id.mal_recyclerview); - adapter = new MaterialAboutListAdapter(getViewTypeManager()); - recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); - recyclerView.setAdapter(adapter); - - RecyclerView.ItemAnimator animator = recyclerView.getItemAnimator(); - if (animator instanceof SimpleItemAnimator) { - ((SimpleItemAnimator) animator).setSupportsChangeAnimations(false); - } - - recyclerView.setAlpha(0f); - recyclerView.setTranslationY(20); - - ListTask task = new ListTask(getActivity()); - task.execute(); - - return rootView; - } - - protected ViewTypeManager getViewTypeManager() { - return new DefaultViewTypeManager(); - } - - protected MaterialAboutList getList() { - return list; - } - - protected void setMaterialAboutList(MaterialAboutList materialAboutList) { - //recyclerView.stopScroll(); - //recyclerView.getRecycledViewPool().clear(); - list = materialAboutList; - adapter.setData(list.getCards()); - } - - @Override - public void onPause() { - super.onPause(); - } - - protected void refreshMaterialAboutList() { - setMaterialAboutList(list); - } - - private class ListTask extends AsyncTask { - - Context fragmentContext; - - public ListTask(Context activityContext) { - this.fragmentContext = activityContext; - } - - @Override - protected String doInBackground(String... params) { - list = getMaterialAboutList(fragmentContext); - return null; - } - - @Override - protected void onPostExecute(String s) { - if (list == null) - return;// TODO: 2019-05-09 dirty fix tbh - adapter.setData(list.getCards()); - - if (shouldAnimate()) { - recyclerView.animate() - .alpha(1f) - .translationY(0f) - .setDuration(600) - .setInterpolator(new FastOutSlowInInterpolator()) - .start(); - } else { - recyclerView.setAlpha(1f); - recyclerView.setTranslationY(0f); - } - - super.onPostExecute(s); - fragmentContext = null; - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/adapters/MaterialAboutItemAdapter.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/adapters/MaterialAboutItemAdapter.java deleted file mode 100644 index a3cd1e47..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/adapters/MaterialAboutItemAdapter.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.danielstone.materialaboutlibrary.adapters; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.AsyncListDiffer; -import androidx.recyclerview.widget.DiffUtil; -import androidx.recyclerview.widget.RecyclerView; - -import com.danielstone.materialaboutlibrary.holders.MaterialAboutItemViewHolder; -import com.danielstone.materialaboutlibrary.items.MaterialAboutItem; -import com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager; -import com.danielstone.materialaboutlibrary.util.ViewTypeManager; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -public class MaterialAboutItemAdapter extends RecyclerView.Adapter { - - private final AsyncListDiffer differ = new AsyncListDiffer(this, DIFF_CALLBACK); - - private ViewTypeManager viewTypeManager; - - private Context context; - - private List data = new ArrayList<>(); - private List oldData = new ArrayList<>(); - - MaterialAboutItemAdapter() { - setHasStableIds(true); - this.viewTypeManager = new DefaultViewTypeManager(); - } - - MaterialAboutItemAdapter(ViewTypeManager customViewTypeManager) { - //Log.d("MaterialItem", "Created adapter"); - setHasStableIds(true); - this.viewTypeManager = customViewTypeManager; - } - - @NonNull - @Override - public MaterialAboutItemViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) { - context = viewGroup.getContext(); - if (!(viewGroup instanceof RecyclerView)) { - throw new RuntimeException("Not bound to RecyclerView"); - } - - int layoutId = viewTypeManager.getLayout(viewType); - - View view = LayoutInflater.from(viewGroup.getContext()).inflate(layoutId, viewGroup, false); - view.setFocusable(true); - - return viewTypeManager.getViewHolder(viewType, view); - } - - @Override - public void onBindViewHolder(MaterialAboutItemViewHolder holder, int position) { - /*if (data.get(position) instanceof MaterialAboutSwitchItem) { - Log.d("MaterialAdapter", "Item "+((MaterialAboutSwitchItem) data.get(position)).getText()+" checked "+((MaterialAboutSwitchItem) data.get(position)).getChecked()); - }*/ - //Log.d("MaterialItem", "Binding "+data.get(position).getDetailString()); - viewTypeManager.setupItem(getItemViewType(position), holder, data.get(position), context); - } - - - @Override - public long getItemId(int position) { - return UUID.fromString(data.get(position).getId()).getMostSignificantBits() & Long.MAX_VALUE; - } - - @Override - public int getItemCount() { - return data.size(); - } - - @Override - public int getItemViewType(int position) { - return data.get(position).getType(); - } - - public void setData(ArrayList data) { - this.data = data; - - notifyDataSetChanged(); - // diff this with previous data - /*DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new MyDiffCallback(oldData, data)); - try { - diffResult.dispatchUpdatesTo(this); - } - catch (IllegalStateException e) { - e.printStackTrace(); - } - - // clone the new data to make further diffs - oldData = new ArrayList<>(); - for (MaterialAboutItem item : data) { - oldData.add(item.clone()); - }*/ - - /*List newData = new ArrayList<>(); - for (MaterialAboutItem item : data) { - newData.add(item.clone()); - } - differ.submitList(newData);*/ - } - - public List getData() { - return data; - } - - - public static final DiffUtil.ItemCallback DIFF_CALLBACK = new DiffUtil.ItemCallback() { - @Override - public boolean areItemsTheSame(MaterialAboutItem oldItem, MaterialAboutItem newItem) { - return oldItem.getId().equals(newItem.getId()); - } - - @Override - public boolean areContentsTheSame(MaterialAboutItem oldItem, MaterialAboutItem newItem) { - return oldItem.getDetailString().equals(newItem.getDetailString()); - } - }; - - public class MyDiffCallback extends DiffUtil.Callback{ - - List oldPersons; - List newPersons; - - public MyDiffCallback(List newPersons, List oldPersons) { - this.newPersons = newPersons; - this.oldPersons = oldPersons; - } - - @Override - public int getOldListSize() { - return oldPersons.size(); - } - - @Override - public int getNewListSize() { - return newPersons.size(); - } - - @Override - public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) { - return oldPersons.get(oldItemPosition).getId().equals(newPersons.get(newItemPosition).getId()); - } - - @Override - public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) { - return oldPersons.get(oldItemPosition).getDetailString().equals(newPersons.get(newItemPosition).getDetailString()); - } - - @Nullable - @Override - public Object getChangePayload(int oldItemPosition, int newItemPosition) { - //you can return particular field for changed item. - return super.getChangePayload(oldItemPosition, newItemPosition); - } - } - -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/adapters/MaterialAboutListAdapter.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/adapters/MaterialAboutListAdapter.java deleted file mode 100644 index e795ee31..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/adapters/MaterialAboutListAdapter.java +++ /dev/null @@ -1,237 +0,0 @@ -package com.danielstone.materialaboutlibrary.adapters; - -import android.content.Context; - -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.AsyncListDiffer; -import androidx.recyclerview.widget.DiffUtil; -import androidx.cardview.widget.CardView; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.danielstone.materialaboutlibrary.R; -import com.danielstone.materialaboutlibrary.model.MaterialAboutCard; -import com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager; -import com.danielstone.materialaboutlibrary.util.ViewTypeManager; -import com.google.android.material.card.MaterialCardView; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -public class MaterialAboutListAdapter extends RecyclerView.Adapter { - - private final AsyncListDiffer differ = new AsyncListDiffer(this, DIFF_CALLBACK); - - private ViewTypeManager viewTypeManager; - - private Context context; - - private List data = new ArrayList<>(); - private List oldData = new ArrayList<>(); - - public MaterialAboutListAdapter() { - setHasStableIds(true); - this.viewTypeManager = new DefaultViewTypeManager(); - } - - public MaterialAboutListAdapter(ViewTypeManager customViewTypeManager) { - //Log.d("MaterialList", "Created list adapter"); - setHasStableIds(true); - this.viewTypeManager = customViewTypeManager; - } - - @Override - public MaterialAboutListViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) { - context = viewGroup.getContext(); - if (viewGroup instanceof RecyclerView) { - View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.mal_material_about_list_card, viewGroup, false); - view.setFocusable(true); - return new MaterialAboutListViewHolder(view); - } else { - throw new RuntimeException("Not bound to RecyclerView"); - } - } - - @Override - public void onBindViewHolder(MaterialAboutListViewHolder holder, int position) { - MaterialAboutCard card = data.get(position); - - if (holder.cardView instanceof CardView) { - CardView cardView = (CardView) holder.cardView; - int cardColor = card.getCardColor(); - if (cardColor != 0) { - cardView.setCardBackgroundColor(cardColor); - } - } - - CharSequence title = card.getTitle(); - int titleRes = card.getTitleRes(); - - holder.title.setVisibility(View.VISIBLE); - if (title != null) { - holder.title.setText(title); - } else if (titleRes != 0) { - holder.title.setText(titleRes); - } else { - holder.title.setVisibility(View.GONE); - } - - int titleColor = card.getTitleColor(); - - if (holder.title.getVisibility() == View.VISIBLE) { - if (titleColor != 0) { - holder.title.setTextColor(titleColor); - } else { - holder.title.setTextColor(holder.title.getTextColors().getDefaultColor()); - } - } - - if (card.getCustomAdapter() != null) { - holder.useCustomAdapter(card.getCustomAdapter()); - } else { - holder.useMaterialAboutItemAdapter(); - ((MaterialAboutItemAdapter) holder.adapter).setData(card.getItems()); - } - } - - @Override - public long getItemId(int position) { - return UUID.fromString(data.get(position).getId()).getMostSignificantBits() & Long.MAX_VALUE; - } - - @Override - public int getItemCount() { - return data.size(); - } - - public void setData(ArrayList data) { - this.data = data; - - notifyDataSetChanged(); - - /*// diff this with previous data - DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new MyDiffCallback(oldData, data)); - try { - diffResult.dispatchUpdatesTo(this); - } - catch (IllegalStateException e) { - e.printStackTrace(); - } - - // clone the new data to make further diffs - oldData = new ArrayList<>(); - for (MaterialAboutCard card : data) { - oldData.add(card.clone()); - }*/ - //differ.submitList(newData); - } - - - List getData() { - return data; - } - - class MaterialAboutListViewHolder extends RecyclerView.ViewHolder { - - final View cardView; - final TextView title; - final RecyclerView recyclerView; - RecyclerView.Adapter adapter; - - MaterialAboutListViewHolder(View view) { - super(view); - cardView = view.findViewById(R.id.mal_list_card); - title = (TextView) view.findViewById(R.id.mal_list_card_title); - recyclerView = (RecyclerView) view.findViewById(R.id.mal_card_recyclerview); - adapter = new MaterialAboutItemAdapter(viewTypeManager); - recyclerView.setLayoutManager(new LinearLayoutManager(context)); - recyclerView.setAdapter(adapter); - recyclerView.setNestedScrollingEnabled(false); - } - - public void useMaterialAboutItemAdapter() { - if (!(adapter instanceof MaterialAboutItemAdapter)) { - adapter = new MaterialAboutItemAdapter(viewTypeManager); - recyclerView.setLayoutManager(new LinearLayoutManager(context)); - recyclerView.setAdapter(adapter); - } - } - - public void useCustomAdapter(RecyclerView.Adapter newAdapter) { - if (adapter instanceof MaterialAboutItemAdapter) { - recyclerView.setLayoutManager(new LinearLayoutManager(context)); - recyclerView.setAdapter(newAdapter); - } - } - } - - - public static final DiffUtil.ItemCallback DIFF_CALLBACK = new DiffUtil.ItemCallback() { - @Override - public boolean areItemsTheSame(MaterialAboutCard oldItem, MaterialAboutCard newItem) { - return oldItem.getId().equals(newItem.getId()); - } - - @Override - public boolean areContentsTheSame(MaterialAboutCard oldCard, MaterialAboutCard newCard) { - boolean result; - result = oldCard.toString().equals(newCard.toString()); - if (oldCard.getItems().size() != newCard.getItems().size()) return false; - for (int i = 0; i < oldCard.getItems().size(); i++) { - if (!oldCard.getItems().get(i).getDetailString().equals(newCard.getItems().get(i).getDetailString())) return false; - } - return result; - } - }; - - public class MyDiffCallback extends DiffUtil.Callback{ - - List oldPersons; - List newPersons; - - public MyDiffCallback(List newPersons, List oldPersons) { - this.newPersons = newPersons; - this.oldPersons = oldPersons; - } - - @Override - public int getOldListSize() { - return oldPersons.size(); - } - - @Override - public int getNewListSize() { - return newPersons.size(); - } - - @Override - public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) { - return oldPersons.get(oldItemPosition).getId().equals(newPersons.get(newItemPosition).getId()); - } - - @Override - public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) { - boolean result; - result = oldPersons.get(oldItemPosition).toString().equals(newPersons.get(newItemPosition).toString()); - if (oldPersons.get(oldItemPosition).getItems().size() != newPersons.get(newItemPosition).getItems().size()) return false; - for (int i = 0; i < oldPersons.get(oldItemPosition).getItems().size(); i++) { - if (!oldPersons.get(oldItemPosition).getItems().get(i).getDetailString().equals(newPersons.get(newItemPosition).getItems().get(i).getDetailString())) return false; - } - return result; - } - - @Nullable - @Override - public Object getChangePayload(int oldItemPosition, int newItemPosition) { - //you can return particular field for changed item. - return super.getChangePayload(oldItemPosition, newItemPosition); - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/holders/MaterialAboutItemViewHolder.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/holders/MaterialAboutItemViewHolder.java deleted file mode 100644 index 6188817b..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/holders/MaterialAboutItemViewHolder.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.danielstone.materialaboutlibrary.holders; - -import androidx.recyclerview.widget.RecyclerView; -import android.view.View; - -public abstract class MaterialAboutItemViewHolder extends RecyclerView.ViewHolder { - - public MaterialAboutItemViewHolder(View itemView) { - super(itemView); - } - -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutActionItem.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutActionItem.java deleted file mode 100644 index c69f106d..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutActionItem.java +++ /dev/null @@ -1,488 +0,0 @@ -package com.danielstone.materialaboutlibrary.items; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.os.Build; - -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.IntDef; -import androidx.annotation.StringRes; -import android.text.Html; -import android.util.TypedValue; -import android.view.Gravity; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.danielstone.materialaboutlibrary.R; -import com.danielstone.materialaboutlibrary.holders.MaterialAboutItemViewHolder; -import com.danielstone.materialaboutlibrary.util.ViewTypeManager; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -import static android.view.View.GONE; - -public class MaterialAboutActionItem extends MaterialAboutItem { - - public static final int GRAVITY_TOP = 0; - public static final int GRAVITY_MIDDLE = 1; - public static final int GRAVITY_BOTTOM = 2; - private CharSequence text = null; - private int textRes = 0; - private CharSequence subText = null; - private int subTextRes = 0; - private int textColor = -1; - private int subTextColor = -1; - private Drawable icon = null; - private int iconRes = 0; - private boolean showIcon = true; - private int iconGravity = GRAVITY_MIDDLE; - private MaterialAboutItemOnClickAction onClickAction = null; - private MaterialAboutItemOnClickAction onLongClickAction = null; - - private MaterialAboutActionItem(Builder builder) { - super(); - this.text = builder.text; - this.textRes = builder.textRes; - - this.subText = builder.subText; - this.subTextRes = builder.subTextRes; - - this.textColor = builder.textColor; - this.subTextColor = builder.subTextColor; - - this.icon = builder.icon; - this.iconRes = builder.iconRes; - - this.showIcon = builder.showIcon; - - this.iconGravity = builder.iconGravity; - - this.onClickAction = builder.onClickAction; - this.onLongClickAction = builder.onLongClickAction; - } - - public MaterialAboutActionItem(CharSequence text, CharSequence subText, Drawable icon, MaterialAboutItemOnClickAction onClickAction) { - this.text = text; - this.subText = subText; - this.icon = icon; - this.onClickAction = onClickAction; - } - - public MaterialAboutActionItem(CharSequence text, CharSequence subText, Drawable icon) { - this.text = text; - this.subText = subText; - this.icon = icon; - } - - public MaterialAboutActionItem(int textRes, int subTextRes, int iconRes, MaterialAboutItemOnClickAction onClickAction) { - this.textRes = textRes; - this.subTextRes = subTextRes; - this.iconRes = iconRes; - this.onClickAction = onClickAction; - } - - public MaterialAboutActionItem(int textRes, int subTextRes, int iconRes) { - this.textRes = textRes; - this.subTextRes = subTextRes; - this.iconRes = iconRes; - } - - public static MaterialAboutItemViewHolder getViewHolder(View view) { - return new MaterialAboutActionItemViewHolder(view); - } - - public static void setupItem(MaterialAboutActionItemViewHolder holder, MaterialAboutActionItem item, Context context) { - CharSequence text = item.getText(); - int textRes = item.getTextRes(); - - holder.text.setVisibility(View.VISIBLE); - if (text != null) { - holder.text.setText(text); - } else if (textRes != 0) { - holder.text.setText(textRes); - } else { - holder.text.setVisibility(GONE); - } - - CharSequence subText = item.getSubText(); - int subTextRes = item.getSubTextRes(); - - holder.subText.setVisibility(View.VISIBLE); - if (subText != null) { - holder.subText.setText(subText); - } else if (subTextRes != 0) { - holder.subText.setText(subTextRes); - } else { - holder.subText.setVisibility(GONE); - } - - if (item.getTextColor() != -1) { - holder.text.setTextColor(item.getTextColor()); - } - if (item.getSubTextColor() != -1) { - holder.subText.setTextColor(item.getSubTextColor()); - } - - if (item.shouldShowIcon()) { - holder.icon.setVisibility(View.VISIBLE); - Drawable drawable = item.getIcon(); - int drawableRes = item.getIconRes(); - if (drawable != null) { - holder.icon.setImageDrawable(drawable); - } else if (drawableRes != 0) { - holder.icon.setImageResource(drawableRes); - } - } else { - holder.icon.setVisibility(GONE); - } - - LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) holder.icon.getLayoutParams(); - switch (item.getIconGravity()) { - case MaterialAboutActionItem.GRAVITY_TOP: - params.gravity = Gravity.TOP; - break; - case MaterialAboutActionItem.GRAVITY_MIDDLE: - params.gravity = Gravity.CENTER_VERTICAL; - break; - case MaterialAboutActionItem.GRAVITY_BOTTOM: - params.gravity = Gravity.BOTTOM; - break; - } - holder.icon.setLayoutParams(params); - - int pL = 0, pT = 0, pR = 0, pB = 0; - if (Build.VERSION.SDK_INT < 21) { - pL = holder.view.getPaddingLeft(); - pT = holder.view.getPaddingTop(); - pR = holder.view.getPaddingRight(); - pB = holder.view.getPaddingBottom(); - } - - if (item.getOnClickAction() != null || item.getOnLongClickAction() != null) { - TypedValue outValue = new TypedValue(); - context.getTheme().resolveAttribute(R.attr.selectableItemBackground, outValue, true); - holder.view.setBackgroundResource(outValue.resourceId); - } else { - holder.view.setBackgroundResource(0); - } - holder.setOnClickAction(item.getOnClickAction()); - holder.setOnLongClickAction(item.getOnLongClickAction()); - - if (Build.VERSION.SDK_INT < 21) { - holder.view.setPadding(pL, pT, pR, pB); - } - } - - @Override - public int getType() { - return ViewTypeManager.ItemType.ACTION_ITEM; - } - - @Override - public String getDetailString() { - return "MaterialAboutActionItem{" + - "text=" + text + - ", textRes=" + textRes + - ", subText=" + subText + - ", subTextRes=" + subTextRes + - ", textColor=" + textColor + - ", descColor=" + subTextColor + - ", icon=" + icon + - ", iconRes=" + iconRes + - ", showIcon=" + showIcon + - ", iconGravity=" + iconGravity + - ", onClickAction=" + onClickAction + - ", onLongClickAction=" + onLongClickAction + - '}'; - } - - public MaterialAboutActionItem(MaterialAboutActionItem item) { - this.id = item.getId(); - this.text = item.getText(); - this.textRes = item.getTextRes(); - this.subText = item.getSubText(); - this.subTextRes = item.getSubTextRes(); - this.textColor = item.getTextColor(); - this.subTextColor = item.getSubTextColor(); - this.icon = item.getIcon(); - this.iconRes = item.getIconRes(); - this.showIcon = item.showIcon; - this.iconGravity = item.iconGravity; - this.onClickAction = item.onClickAction; - this.onLongClickAction = item.onLongClickAction; - } - - @Override - public MaterialAboutItem clone() { - return new MaterialAboutActionItem(this); - } - - public CharSequence getText() { - return text; - } - public MaterialAboutActionItem setText(CharSequence text) { - this.textRes = 0; - this.text = text; - return this; - } - - public int getTextRes() { - return textRes; - } - - public MaterialAboutActionItem setTextRes(int textRes) { - this.text = null; - this.textRes = textRes; - return this; - } - - public CharSequence getSubText() { - return subText; - } - - public MaterialAboutActionItem setSubText(CharSequence subText) { - this.subTextRes = 0; - this.subText = subText; - return this; - } - - public int getSubTextRes() { - return subTextRes; - } - - public MaterialAboutActionItem setSubTextRes(int subTextRes) { - this.subText = null; - this.subTextRes = subTextRes; - return this; - } - - public int getTextColor() { - return textColor; - } - - public MaterialAboutActionItem setTextColor(int textColor) { - this.textColor = textColor; - return this; - } - - public int getSubTextColor() { - return subTextColor; - } - - public MaterialAboutActionItem setSubTextColor(int subTextColor) { - this.subTextColor = subTextColor; - return this; - } - - public Drawable getIcon() { - return icon; - } - - public MaterialAboutActionItem setIcon(Drawable icon) { - this.iconRes = 0; - this.icon = icon; - return this; - } - - public int getIconRes() { - return iconRes; - } - - public MaterialAboutActionItem setIconRes(int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public boolean shouldShowIcon() { - return showIcon; - } - - public MaterialAboutActionItem setShouldShowIcon(boolean showIcon) { - this.showIcon = showIcon; - return this; - } - - @IconGravity - public int getIconGravity() { - return iconGravity; - } - - public MaterialAboutActionItem setIconGravity(int iconGravity) { - this.iconGravity = iconGravity; - return this; - } - - public MaterialAboutItemOnClickAction getOnClickAction() { - return onClickAction; - } - - public MaterialAboutActionItem setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - return this; - } - - public MaterialAboutItemOnClickAction getOnLongClickAction() { - return onLongClickAction; - } - - public MaterialAboutActionItem setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - return this; - } - - @Retention(RetentionPolicy.SOURCE) - @IntDef({GRAVITY_TOP, GRAVITY_MIDDLE, GRAVITY_BOTTOM}) - public @interface IconGravity { - } - - public static class MaterialAboutActionItemViewHolder extends MaterialAboutItemViewHolder implements View.OnClickListener, View.OnLongClickListener { - public final View view; - public final ImageView icon; - public final TextView text; - public final TextView subText; - private MaterialAboutItemOnClickAction onClickAction; - private MaterialAboutItemOnClickAction onLongClickAction; - - MaterialAboutActionItemViewHolder(View view) { - super(view); - this.view = view; - icon = (ImageView) view.findViewById(R.id.mal_item_image); - text = (TextView) view.findViewById(R.id.mal_item_text); - subText = (TextView) view.findViewById(R.id.mal_action_item_subtext); - } - - public void setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - view.setOnClickListener(onClickAction != null ? this : null); - } - - public void setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - view.setOnLongClickListener(onLongClickAction != null ? this : null); - } - - @Override - public void onClick(View v) { - if (onClickAction != null) { - onClickAction.onClick(); - } - } - - @Override - public boolean onLongClick(View v) { - if (onLongClickAction != null) { - onLongClickAction.onClick(); - return true; - } - return false; - } - } - - public static class Builder { - - MaterialAboutItemOnClickAction onClickAction = null; - MaterialAboutItemOnClickAction onLongClickAction = null; - private CharSequence text = null; - @StringRes - private int textRes = 0; - private CharSequence subText = null; - @StringRes - private int subTextRes = 0; - @ColorInt - private int textColor = -1; - @ColorInt - private int subTextColor = -1; - private Drawable icon = null; - @DrawableRes - private int iconRes = 0; - private boolean showIcon = true; - @IconGravity - private int iconGravity = GRAVITY_MIDDLE; - - public Builder text(CharSequence text) { - this.text = text; - this.textRes = 0; - return this; - } - - public Builder text(@StringRes int text) { - this.textRes = text; - this.text = null; - return this; - } - - public Builder subText(CharSequence subText) { - this.subText = subText; - this.subTextRes = 0; - return this; - } - - public Builder subText(@StringRes int subTextRes) { - this.subText = null; - this.subTextRes = subTextRes; - return this; - } - - public Builder textColor(@ColorInt int textColor) { - this.textColor = textColor; - return this; - } - - public Builder subTextColor(@ColorInt int subTextColor) { - this.subTextColor = subTextColor; - return this; - } - - public Builder subTextHtml(String subTextHtml) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - this.subText = Html.fromHtml(subTextHtml, Html.FROM_HTML_MODE_LEGACY); - } else { - //noinspection deprecation - this.subText = Html.fromHtml(subTextHtml); - } - this.subTextRes = 0; - return this; - } - - public Builder icon(Drawable icon) { - this.icon = icon; - this.iconRes = 0; - return this; - } - - public Builder icon(@DrawableRes int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public Builder showIcon(boolean showIcon) { - this.showIcon = showIcon; - return this; - } - - public Builder setIconGravity(@IconGravity int iconGravity) { - this.iconGravity = iconGravity; - return this; - } - - public Builder setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - return this; - } - - public Builder setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - return this; - } - - public MaterialAboutActionItem build() { - return new MaterialAboutActionItem(this); - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutActionSwitchItem.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutActionSwitchItem.java deleted file mode 100644 index eb6d9411..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutActionSwitchItem.java +++ /dev/null @@ -1,606 +0,0 @@ -package com.danielstone.materialaboutlibrary.items; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.os.Build; -import androidx.annotation.DrawableRes; -import androidx.annotation.IntDef; -import androidx.annotation.StringRes; -import androidx.appcompat.widget.SwitchCompat; - -import android.text.Html; -import android.util.TypedValue; -import android.view.Gravity; -import android.view.View; -import android.widget.CompoundButton; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.Switch; -import android.widget.TextView; - -import com.danielstone.materialaboutlibrary.R; -import com.danielstone.materialaboutlibrary.holders.MaterialAboutItemViewHolder; -import com.danielstone.materialaboutlibrary.util.ViewTypeManager; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -import static android.view.View.GONE; - -public class MaterialAboutActionSwitchItem extends MaterialAboutItem { - - public static final int GRAVITY_TOP = 0; - public static final int GRAVITY_MIDDLE = 1; - public static final int GRAVITY_BOTTOM = 2; - private CharSequence text = null; - private int textRes = 0; - private CharSequence subText = null; - private int subTextRes = 0; - private CharSequence subTextChecked = null; - private int subTextCheckedRes = 0; - private Drawable icon = null; - private int iconRes = 0; - private boolean showIcon = true; - private int iconGravity = GRAVITY_MIDDLE; - private boolean checked = false; - private int tag = -1; - private MaterialAboutItemOnClickAction onClickAction = null; - private MaterialAboutItemOnClickAction onLongClickAction = null; - private MaterialAboutItemOnChangeAction onChangeAction = null; - - private MaterialAboutActionSwitchItem(Builder builder) { - super(); - this.text = builder.text; - this.textRes = builder.textRes; - - this.subText = builder.subText; - this.subTextRes = builder.subTextRes; - - this.subTextChecked = builder.subTextChecked; - this.subTextCheckedRes = builder.subTextCheckedRes; - - this.icon = builder.icon; - this.iconRes = builder.iconRes; - - this.showIcon = builder.showIcon; - - this.iconGravity = builder.iconGravity; - - this.checked = builder.checked; - - this.tag = builder.tag; - - this.onClickAction = builder.onClickAction; - this.onLongClickAction = builder.onLongClickAction; - this.onChangeAction = builder.onChangeAction; - } - - public MaterialAboutActionSwitchItem(CharSequence text, CharSequence subText, Drawable icon, MaterialAboutItemOnChangeAction onChangeAction) { - this.text = text; - this.subText = subText; - this.icon = icon; - this.onChangeAction = onChangeAction; - } - - public MaterialAboutActionSwitchItem(CharSequence text, CharSequence subText, Drawable icon) { - this.text = text; - this.subText = subText; - this.icon = icon; - } - - public MaterialAboutActionSwitchItem(int textRes, int subTextRes, int iconRes, MaterialAboutItemOnChangeAction onChangeAction) { - this.textRes = textRes; - this.subTextRes = subTextRes; - this.iconRes = iconRes; - this.onChangeAction = onChangeAction; - } - - public MaterialAboutActionSwitchItem(int textRes, int subTextRes, int iconRes) { - this.textRes = textRes; - this.subTextRes = subTextRes; - this.iconRes = iconRes; - } - - public static void setupItem(MaterialAboutActionSwitchItemViewHolder holder, MaterialAboutActionSwitchItem item, Context context) { - holder.switchItem = item; - - CharSequence text = item.getText(); - int textRes = item.getTextRes(); - - holder.text.setVisibility(View.VISIBLE); - if (text != null) { - holder.text.setText(text); - } else if (textRes != 0) { - holder.text.setText(textRes); - } else { - holder.text.setVisibility(GONE); - } - - CharSequence subText = item.getSubText(); - int subTextRes = item.getSubTextRes(); - - holder.subText.setVisibility(View.VISIBLE); - if (subText != null) { - holder.subText.setText(subText); - } else if (subTextRes != 0) { - holder.subText.setText(subTextRes); - } else { - holder.subText.setVisibility(GONE); - } - - if (item.shouldShowIcon()) { - holder.icon.setVisibility(View.VISIBLE); - Drawable drawable = item.getIcon(); - int drawableRes = item.getIconRes(); - if (drawable != null) { - holder.icon.setImageDrawable(drawable); - } else if (drawableRes != 0) { - holder.icon.setImageResource(drawableRes); - } - } else { - holder.icon.setVisibility(GONE); - } - - LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) holder.icon.getLayoutParams(); - switch (item.getIconGravity()) { - case MaterialAboutActionSwitchItem.GRAVITY_TOP: - params.gravity = Gravity.TOP; - break; - case MaterialAboutActionSwitchItem.GRAVITY_MIDDLE: - params.gravity = Gravity.CENTER_VERTICAL; - break; - case MaterialAboutActionSwitchItem.GRAVITY_BOTTOM: - params.gravity = Gravity.BOTTOM; - break; - } - holder.icon.setLayoutParams(params); - - int pL = 0, pT = 0, pR = 0, pB = 0; - if (Build.VERSION.SDK_INT < 21) { - pL = holder.view.getPaddingLeft(); - pT = holder.view.getPaddingTop(); - pR = holder.view.getPaddingRight(); - pB = holder.view.getPaddingBottom(); - } - - holder.setChecked(item.getChecked()); - - if (item.getOnChangeAction() != null || item.getOnClickAction() != null || item.getOnLongClickAction() != null) { - TypedValue outValue = new TypedValue(); - context.getTheme().resolveAttribute(R.attr.selectableItemBackground, outValue, true); - holder.view.setBackgroundResource(outValue.resourceId); - } else { - holder.view.setBackgroundResource(0); - } - holder.setOnClickAction(item.getOnClickAction()); - holder.setOnLongClickAction(item.getOnLongClickAction()); - holder.setOnChangeAction(item.getOnChangeAction()); - - if (Build.VERSION.SDK_INT < 21) { - holder.view.setPadding(pL, pT, pR, pB); - } - } - - public static MaterialAboutItemViewHolder getViewHolder(View view) { - return new MaterialAboutActionSwitchItemViewHolder(view); - } - - public static class MaterialAboutActionSwitchItemViewHolder extends MaterialAboutItemViewHolder implements View.OnClickListener, View.OnLongClickListener, CompoundButton.OnCheckedChangeListener { - public final View view; - public final ImageView icon; - public final TextView text; - public final TextView subText; - public final SwitchCompat switchView; - private MaterialAboutItemOnClickAction onClickAction; - private MaterialAboutItemOnClickAction onLongClickAction; - private MaterialAboutItemOnChangeAction onChangeAction; - private MaterialAboutActionSwitchItem switchItem; - - MaterialAboutActionSwitchItemViewHolder(View view) { - super(view); - this.view = view.findViewById(R.id.mal_action_root); - icon = view.findViewById(R.id.mal_item_image); - text = view.findViewById(R.id.mal_item_text); - subText = view.findViewById(R.id.mal_action_item_subtext); - switchView = view.findViewById(R.id.mal_switch); - } - - public void setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - view.setOnClickListener(onClickAction != null ? this : null); - } - - public void setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - view.setOnLongClickListener(onLongClickAction != null ? this : null); - } - - public void setOnChangeAction(MaterialAboutItemOnChangeAction onChangeAction) { - this.onChangeAction = onChangeAction; - switchView.setOnCheckedChangeListener(this); - } - - public void setChecked(boolean checked) { - switchView.setChecked(checked); - switchItem.checked = checked; - updateSubText(checked); - } - - public void updateSubText(boolean checked) { - if (checked && switchItem.subTextChecked != null) { - subText.setText(switchItem.subTextChecked); - } - else if (checked && switchItem.subTextCheckedRes != 0) { - subText.setText(switchItem.subTextCheckedRes); - } - else if (switchItem.subText != null) { - subText.setText(switchItem.subText); - } - else if (switchItem.subTextRes != 0) { - subText.setText(switchItem.subTextRes); - } - } - - @Override - public void onClick(View v) { - if (onClickAction != null) { - onClickAction.onClick(); - } - } - - @Override - public boolean onLongClick(View v) { - if (onLongClickAction != null) { - onLongClickAction.onClick(); - return true; - } - return false; - } - - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - updateSubText(isChecked); - if (onChangeAction != null) { - if (!onChangeAction.onChange(isChecked, switchItem.getTag())) { - setChecked(!isChecked); - } - else { - switchItem.checked = isChecked; - } - } - else { - setChecked(!isChecked); - } - } - } - - @Override - public int getType() { - return ViewTypeManager.ItemType.ACTION_SWITCH_ITEM; - } - - @Override - public String getDetailString() { - return "MaterialAboutActionSwitchItem{" + - "text=" + text + - ", textRes=" + textRes + - ", subText=" + subText + - ", subTextRes=" + subTextRes + - ", subTextChecked=" + subTextChecked + - ", subTextCheckedRes=" + subTextCheckedRes + - ", icon=" + icon + - ", iconRes=" + iconRes + - ", showIcon=" + showIcon + - ", iconGravity=" + iconGravity + - ", checked=" + checked + - ", tag=" + tag + - ", onClickAction=" + onClickAction + - ", onLongClickAction=" + onLongClickAction + - ", onChangeAction=" + onChangeAction + - '}'; - } - - public MaterialAboutActionSwitchItem(MaterialAboutActionSwitchItem item) { - this.id = item.getId(); - this.text = item.getText(); - this.textRes = item.getTextRes(); - this.subText = item.getSubText(); - this.subTextRes = item.getSubTextRes(); - this.subTextChecked = item.getSubTextChecked(); - this.subTextCheckedRes = item.getSubTextCheckedRes(); - this.icon = item.getIcon(); - this.iconRes = item.getIconRes(); - this.showIcon = item.showIcon; - this.iconGravity = item.iconGravity; - this.checked = item.checked; - this.tag = item.tag; - this.onClickAction = item.onClickAction; - this.onLongClickAction = item.onLongClickAction; - this.onChangeAction = item.onChangeAction; - } - - @Override - public MaterialAboutItem clone() { - return new MaterialAboutActionSwitchItem(this); - } - - public int getTag() { - return tag; - } - public MaterialAboutActionSwitchItem setTag(int tag) { - this.tag = tag; - return this; - } - - public CharSequence getText() { - return text; - } - public MaterialAboutActionSwitchItem setText(CharSequence text) { - this.textRes = 0; - this.text = text; - return this; - } - - public int getTextRes() { - return textRes; - } - - public MaterialAboutActionSwitchItem setTextRes(int textRes) { - this.text = null; - this.textRes = textRes; - return this; - } - - public CharSequence getSubText() { - return subText; - } - - public MaterialAboutActionSwitchItem setSubText(CharSequence subText) { - this.subTextRes = 0; - this.subText = subText; - return this; - } - - public int getSubTextRes() { - return subTextRes; - } - - public MaterialAboutActionSwitchItem setSubTextRes(int subTextRes) { - this.subText = null; - this.subTextRes = subTextRes; - return this; - } - - public CharSequence getSubTextChecked() { - return subTextChecked; - } - - public MaterialAboutActionSwitchItem setSubTextChecked(CharSequence subTextChecked) { - this.subTextCheckedRes = 0; - this.subTextChecked = subTextChecked; - return this; - } - - public int getSubTextCheckedRes() { - return subTextCheckedRes; - } - - public MaterialAboutActionSwitchItem setSubTextCheckedRes(int subTextCheckedRes) { - this.subTextChecked = null; - this.subTextCheckedRes = subTextCheckedRes; - return this; - } - - public Drawable getIcon() { - return icon; - } - - public MaterialAboutActionSwitchItem setIcon(Drawable icon) { - this.iconRes = 0; - this.icon = icon; - return this; - } - - public int getIconRes() { - return iconRes; - } - - public MaterialAboutActionSwitchItem setIconRes(int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public boolean shouldShowIcon() { - return showIcon; - } - - public MaterialAboutActionSwitchItem setShouldShowIcon(boolean showIcon) { - this.showIcon = showIcon; - return this; - } - - @IconGravity - public int getIconGravity() { - return iconGravity; - } - - public MaterialAboutActionSwitchItem setIconGravity(int iconGravity) { - this.iconGravity = iconGravity; - return this; - } - - public boolean getChecked() { - return checked; - } - - public MaterialAboutActionSwitchItem setChecked(boolean checked) { - this.checked = checked; - return this; - } - - public MaterialAboutItemOnClickAction getOnClickAction() { - return onClickAction; - } - - public MaterialAboutActionSwitchItem setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - return this; - } - - public MaterialAboutItemOnClickAction getOnLongClickAction() { - return onLongClickAction; - } - - public MaterialAboutActionSwitchItem setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - return this; - } - - public MaterialAboutItemOnChangeAction getOnChangeAction() { - return onChangeAction; - } - - public MaterialAboutActionSwitchItem setOnChangeAction(MaterialAboutItemOnChangeAction onChangeAction) { - this.onChangeAction = onChangeAction; - return this; - } - - @Retention(RetentionPolicy.SOURCE) - @IntDef({GRAVITY_TOP, GRAVITY_MIDDLE, GRAVITY_BOTTOM}) - public @interface IconGravity { - } - - public static class Builder { - - MaterialAboutItemOnClickAction onClickAction = null; - MaterialAboutItemOnClickAction onLongClickAction = null; - MaterialAboutItemOnChangeAction onChangeAction = null; - private CharSequence text = null; - @StringRes - private int textRes = 0; - private CharSequence subText = null; - @StringRes - private int subTextRes = 0; - private CharSequence subTextChecked = null; - @StringRes - private int subTextCheckedRes = 0; - private Drawable icon = null; - @DrawableRes - private int iconRes = 0; - private boolean showIcon = true; - @IconGravity - private int iconGravity = GRAVITY_MIDDLE; - private boolean checked = false; - private int tag = -1; - - public Builder tag(int tag) { - this.tag = tag; - return this; - } - - public Builder text(CharSequence text) { - this.text = text; - this.textRes = 0; - return this; - } - - public Builder text(@StringRes int text) { - this.textRes = text; - this.text = null; - return this; - } - - public Builder subText(CharSequence subText) { - this.subText = subText; - this.subTextRes = 0; - return this; - } - - public Builder subText(@StringRes int subTextRes) { - this.subText = null; - this.subTextRes = subTextRes; - return this; - } - - public Builder subTextHtml(String subTextHtml) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - this.subText = Html.fromHtml(subTextHtml, Html.FROM_HTML_MODE_LEGACY); - } else { - //noinspection deprecation - this.subText = Html.fromHtml(subTextHtml); - } - this.subTextRes = 0; - return this; - } - - public Builder subTextChecked(CharSequence subTextChecked) { - this.subTextChecked = subTextChecked; - this.subTextCheckedRes = 0; - return this; - } - - public Builder subTextChecked(@StringRes int subTextCheckedRes) { - this.subTextChecked = null; - this.subTextCheckedRes = subTextCheckedRes; - return this; - } - - public Builder subTextCheckedHtml(String subTextCheckedHtml) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - this.subTextChecked = Html.fromHtml(subTextCheckedHtml, Html.FROM_HTML_MODE_LEGACY); - } else { - //noinspection deprecation - this.subTextChecked = Html.fromHtml(subTextCheckedHtml); - } - this.subTextCheckedRes = 0; - return this; - } - - public Builder icon(Drawable icon) { - this.icon = icon; - this.iconRes = 0; - return this; - } - - public Builder icon(@DrawableRes int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public Builder showIcon(boolean showIcon) { - this.showIcon = showIcon; - return this; - } - - public Builder setIconGravity(@IconGravity int iconGravity) { - this.iconGravity = iconGravity; - return this; - } - - public Builder setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - return this; - } - - public Builder setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - return this; - } - - public Builder setOnChangeAction(MaterialAboutItemOnChangeAction onChangeAction) { - this.onChangeAction = onChangeAction; - return this; - } - - public Builder checked(boolean isChecked) { - this.checked = isChecked; - return this; - } - - public MaterialAboutActionSwitchItem build() { - return new MaterialAboutActionSwitchItem(this); - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutCheckboxItem.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutCheckboxItem.java deleted file mode 100644 index 16a6cd45..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutCheckboxItem.java +++ /dev/null @@ -1,538 +0,0 @@ -package com.danielstone.materialaboutlibrary.items; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.os.Build; -import androidx.annotation.DrawableRes; -import androidx.annotation.IntDef; -import androidx.annotation.StringRes; -import android.text.Html; -import android.util.TypedValue; -import android.view.Gravity; -import android.view.View; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.danielstone.materialaboutlibrary.R; -import com.danielstone.materialaboutlibrary.holders.MaterialAboutItemViewHolder; -import com.danielstone.materialaboutlibrary.util.ViewTypeManager; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -import static android.view.View.GONE; - -public class MaterialAboutCheckboxItem extends MaterialAboutItem { - - public static final int GRAVITY_TOP = 0; - public static final int GRAVITY_MIDDLE = 1; - public static final int GRAVITY_BOTTOM = 2; - private CharSequence text = null; - private int textRes = 0; - private CharSequence subText = null; - private int subTextRes = 0; - private CharSequence subTextChecked = null; - private int subTextCheckedRes = 0; - private Drawable icon = null; - private int iconRes = 0; - private boolean showIcon = true; - private int iconGravity = GRAVITY_MIDDLE; - private boolean checked = false; - private int tag = -1; - private MaterialAboutItemOnChangeAction onChangeAction = null; - - private MaterialAboutCheckboxItem(Builder builder) { - super(); - this.text = builder.text; - this.textRes = builder.textRes; - - this.subText = builder.subText; - this.subTextRes = builder.subTextRes; - - this.subTextChecked = builder.subTextChecked; - this.subTextCheckedRes = builder.subTextCheckedRes; - - this.icon = builder.icon; - this.iconRes = builder.iconRes; - - this.showIcon = builder.showIcon; - - this.iconGravity = builder.iconGravity; - - this.checked = builder.checked; - - this.tag = builder.tag; - - this.onChangeAction = builder.onChangeAction; - } - - public MaterialAboutCheckboxItem(CharSequence text, CharSequence subText, Drawable icon, MaterialAboutItemOnChangeAction onChangeAction) { - this.text = text; - this.subText = subText; - this.icon = icon; - this.onChangeAction = onChangeAction; - } - - public MaterialAboutCheckboxItem(CharSequence text, CharSequence subText, Drawable icon) { - this.text = text; - this.subText = subText; - this.icon = icon; - } - - public MaterialAboutCheckboxItem(int textRes, int subTextRes, int iconRes, MaterialAboutItemOnChangeAction onChangeAction) { - this.textRes = textRes; - this.subTextRes = subTextRes; - this.iconRes = iconRes; - this.onChangeAction = onChangeAction; - } - - public MaterialAboutCheckboxItem(int textRes, int subTextRes, int iconRes) { - this.textRes = textRes; - this.subTextRes = subTextRes; - this.iconRes = iconRes; - } - - public static MaterialAboutItemViewHolder getViewHolder(View view) { - return new MaterialAboutCheckboxItemViewHolder(view); - } - - public static void setupItem(MaterialAboutCheckboxItemViewHolder holder, MaterialAboutCheckboxItem item, Context context) { - holder.switchItem = item; - - CharSequence text = item.getText(); - int textRes = item.getTextRes(); - - holder.text.setVisibility(View.VISIBLE); - if (text != null) { - holder.text.setText(text); - } else if (textRes != 0) { - holder.text.setText(textRes); - } else { - holder.text.setVisibility(GONE); - } - - CharSequence subText = item.getSubText(); - int subTextRes = item.getSubTextRes(); - - holder.subText.setVisibility(View.VISIBLE); - if (subText != null) { - holder.subText.setText(subText); - } else if (subTextRes != 0) { - holder.subText.setText(subTextRes); - } else { - holder.subText.setVisibility(GONE); - } - - if (item.shouldShowIcon()) { - holder.icon.setVisibility(View.VISIBLE); - Drawable drawable = item.getIcon(); - int drawableRes = item.getIconRes(); - if (drawable != null) { - holder.icon.setImageDrawable(drawable); - } else if (drawableRes != 0) { - holder.icon.setImageResource(drawableRes); - } - } else { - holder.icon.setVisibility(GONE); - } - - LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) holder.icon.getLayoutParams(); - switch (item.getIconGravity()) { - case MaterialAboutCheckboxItem.GRAVITY_TOP: - params.gravity = Gravity.TOP; - break; - case MaterialAboutCheckboxItem.GRAVITY_MIDDLE: - params.gravity = Gravity.CENTER_VERTICAL; - break; - case MaterialAboutCheckboxItem.GRAVITY_BOTTOM: - params.gravity = Gravity.BOTTOM; - break; - } - holder.icon.setLayoutParams(params); - - int pL = 0, pT = 0, pR = 0, pB = 0; - if (Build.VERSION.SDK_INT < 21) { - pL = holder.view.getPaddingLeft(); - pT = holder.view.getPaddingTop(); - pR = holder.view.getPaddingRight(); - pB = holder.view.getPaddingBottom(); - } - - - if (item.getOnChangeAction() != null) { - TypedValue outValue = new TypedValue(); - context.getTheme().resolveAttribute(R.attr.selectableItemBackground, outValue, true); - holder.view.setBackgroundResource(outValue.resourceId); - } else { - holder.view.setBackgroundResource(0); - } - holder.setOnChangeAction(item.getOnChangeAction()); - - if (Build.VERSION.SDK_INT < 21) { - holder.view.setPadding(pL, pT, pR, pB); - } - } - - @Override - public int getType() { - return ViewTypeManager.ItemType.CHECKBOX_ITEM; - } - - @Override - public String getDetailString() { - return "MaterialAboutCheckboxItem{" + - "text=" + text + - ", textRes=" + textRes + - ", subText=" + subText + - ", subTextRes=" + subTextRes + - ", subTextChecked=" + subTextChecked + - ", subTextCheckedRes=" + subTextCheckedRes + - ", icon=" + icon + - ", iconRes=" + iconRes + - ", showIcon=" + showIcon + - ", iconGravity=" + iconGravity + - ", checked=" + checked + - ", tag=" + tag + - ", onChangeAction=" + onChangeAction + - '}'; - } - - public MaterialAboutCheckboxItem(MaterialAboutCheckboxItem item) { - this.id = item.getId(); - this.text = item.getText(); - this.textRes = item.getTextRes(); - this.subText = item.getSubText(); - this.subTextRes = item.getSubTextRes(); - this.subTextChecked = item.getSubTextChecked(); - this.subTextCheckedRes = item.getSubTextCheckedRes(); - this.icon = item.getIcon(); - this.iconRes = item.getIconRes(); - this.showIcon = item.showIcon; - this.iconGravity = item.iconGravity; - this.checked = item.checked; - this.tag = item.tag; - this.onChangeAction = item.onChangeAction; - } - - @Override - public MaterialAboutItem clone() { - return new MaterialAboutCheckboxItem(this); - } - - public int getTag() { - return tag; - } - public MaterialAboutCheckboxItem setTag(int tag) { - this.tag = tag; - return this; - } - - public CharSequence getText() { - return text; - } - public MaterialAboutCheckboxItem setText(CharSequence text) { - this.textRes = 0; - this.text = text; - return this; - } - - public int getTextRes() { - return textRes; - } - - public MaterialAboutCheckboxItem setTextRes(int textRes) { - this.text = null; - this.textRes = textRes; - return this; - } - - public CharSequence getSubText() { - return subText; - } - - public MaterialAboutCheckboxItem setSubText(CharSequence subText) { - this.subTextRes = 0; - this.subText = subText; - return this; - } - - public int getSubTextRes() { - return subTextRes; - } - - public MaterialAboutCheckboxItem setSubTextRes(int subTextRes) { - this.subText = null; - this.subTextRes = subTextRes; - return this; - } - - public CharSequence getSubTextChecked() { - return subTextChecked; - } - - public MaterialAboutCheckboxItem setSubTextChecked(CharSequence subTextChecked) { - this.subTextCheckedRes = 0; - this.subTextChecked = subTextChecked; - return this; - } - - public int getSubTextCheckedRes() { - return subTextCheckedRes; - } - - public MaterialAboutCheckboxItem setSubTextCheckedRes(int subTextCheckedRes) { - this.subTextChecked = null; - this.subTextCheckedRes = subTextCheckedRes; - return this; - } - - public Drawable getIcon() { - return icon; - } - - public MaterialAboutCheckboxItem setIcon(Drawable icon) { - this.iconRes = 0; - this.icon = icon; - return this; - } - - public int getIconRes() { - return iconRes; - } - - public MaterialAboutCheckboxItem setIconRes(int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public boolean shouldShowIcon() { - return showIcon; - } - - public MaterialAboutCheckboxItem setShouldShowIcon(boolean showIcon) { - this.showIcon = showIcon; - return this; - } - - @IconGravity - public int getIconGravity() { - return iconGravity; - } - - public MaterialAboutCheckboxItem setIconGravity(int iconGravity) { - this.iconGravity = iconGravity; - return this; - } - - public boolean getChecked() { - return checked; - } - - public MaterialAboutCheckboxItem setChecked(boolean checked) { - this.checked = checked; - return this; - } - - public MaterialAboutItemOnChangeAction getOnChangeAction() { - return onChangeAction; - } - - public MaterialAboutCheckboxItem setOnChangeAction(MaterialAboutItemOnChangeAction onChangeAction) { - this.onChangeAction = onChangeAction; - return this; - } - - @Retention(RetentionPolicy.SOURCE) - @IntDef({GRAVITY_TOP, GRAVITY_MIDDLE, GRAVITY_BOTTOM}) - public @interface IconGravity { - } - - public static class MaterialAboutCheckboxItemViewHolder extends MaterialAboutItemViewHolder implements View.OnClickListener, CompoundButton.OnCheckedChangeListener { - public final View view; - public final ImageView icon; - public final TextView text; - public final TextView subText; - public final CheckBox checkBox; - private MaterialAboutItemOnChangeAction onChangeAction; - private MaterialAboutCheckboxItem switchItem; - - MaterialAboutCheckboxItemViewHolder(View view) { - super(view); - this.view = view; - icon = view.findViewById(R.id.mal_item_image); - text = view.findViewById(R.id.mal_item_text); - subText = view.findViewById(R.id.mal_action_item_subtext); - checkBox = view.findViewById(R.id.mal_checkbox); - } - - public void setOnChangeAction(MaterialAboutItemOnChangeAction onChangeAction) { - this.onChangeAction = onChangeAction; - view.setOnClickListener(onChangeAction != null ? this : null); - checkBox.setOnCheckedChangeListener(this); - } - - public void setChecked(boolean checked) { - checkBox.setOnCheckedChangeListener(null); - checkBox.setChecked(checked); - checkBox.setOnCheckedChangeListener(this); - updateSubText(checked); - } - - public void updateSubText(boolean checked) { - if (checked && switchItem.subTextChecked != null) { - subText.setText(switchItem.subTextChecked); - } - else if (checked && switchItem.subTextCheckedRes != 0) { - subText.setText(switchItem.subTextCheckedRes); - } - else if (switchItem.subText != null) { - subText.setText(switchItem.subText); - } - else if (switchItem.subTextRes != 0) { - subText.setText(switchItem.subTextRes); - } - } - - @Override - public void onClick(View v) { - checkBox.toggle(); - } - - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - updateSubText(isChecked); - if (onChangeAction != null) { - if (!onChangeAction.onChange(isChecked, switchItem.getTag())) - setChecked(!isChecked); - } - else { - setChecked(!isChecked); - } - } - } - - public static class Builder { - - MaterialAboutItemOnChangeAction onChangeAction = null; - private CharSequence text = null; - @StringRes - private int textRes = 0; - private CharSequence subText = null; - @StringRes - private int subTextRes = 0; - private CharSequence subTextChecked = null; - @StringRes - private int subTextCheckedRes = 0; - private Drawable icon = null; - @DrawableRes - private int iconRes = 0; - private boolean showIcon = true; - @IconGravity - private int iconGravity = GRAVITY_MIDDLE; - private boolean checked = false; - private int tag = -1; - - public Builder tag(int tag) { - this.tag = tag; - return this; - } - - public Builder text(CharSequence text) { - this.text = text; - this.textRes = 0; - return this; - } - - public Builder text(@StringRes int text) { - this.textRes = text; - this.text = null; - return this; - } - - public Builder subText(CharSequence subText) { - this.subText = subText; - this.subTextRes = 0; - return this; - } - - public Builder subText(@StringRes int subTextRes) { - this.subText = null; - this.subTextRes = subTextRes; - return this; - } - - public Builder subTextHtml(String subTextHtml) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - this.subText = Html.fromHtml(subTextHtml, Html.FROM_HTML_MODE_LEGACY); - } else { - //noinspection deprecation - this.subText = Html.fromHtml(subTextHtml); - } - this.subTextRes = 0; - return this; - } - - public Builder subTextChecked(CharSequence subTextChecked) { - this.subTextChecked = subTextChecked; - this.subTextCheckedRes = 0; - return this; - } - - public Builder subTextChecked(@StringRes int subTextCheckedRes) { - this.subTextChecked = null; - this.subTextCheckedRes = subTextCheckedRes; - return this; - } - - public Builder subTextCheckedHtml(String subTextCheckedHtml) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - this.subTextChecked = Html.fromHtml(subTextCheckedHtml, Html.FROM_HTML_MODE_LEGACY); - } else { - //noinspection deprecation - this.subTextChecked = Html.fromHtml(subTextCheckedHtml); - } - this.subTextCheckedRes = 0; - return this; - } - - public Builder icon(Drawable icon) { - this.icon = icon; - this.iconRes = 0; - return this; - } - - public Builder icon(@DrawableRes int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public Builder showIcon(boolean showIcon) { - this.showIcon = showIcon; - return this; - } - - public Builder setIconGravity(@IconGravity int iconGravity) { - this.iconGravity = iconGravity; - return this; - } - - public Builder setOnChangeAction(MaterialAboutItemOnChangeAction onChangeAction) { - this.onChangeAction = onChangeAction; - return this; - } - - public Builder checked(boolean isChecked) { - this.checked = isChecked; - return this; - } - - public MaterialAboutCheckboxItem build() { - return new MaterialAboutCheckboxItem(this); - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutItem.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutItem.java deleted file mode 100644 index 2d6a5f48..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutItem.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.danielstone.materialaboutlibrary.items; - -import java.util.UUID; - -public abstract class MaterialAboutItem { - - public String id = "NO-UUID"; - - public MaterialAboutItem() { - this.id = UUID.randomUUID().toString(); - } - - public String getId() { - return id; - } - - public abstract int getType(); - - public abstract String getDetailString(); - - public abstract MaterialAboutItem clone(); - -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutItemOnChangeAction.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutItemOnChangeAction.java deleted file mode 100644 index 836883db..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutItemOnChangeAction.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.danielstone.materialaboutlibrary.items; - -public interface MaterialAboutItemOnChangeAction { - boolean onChange(boolean isChecked, int tag); -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutItemOnClickAction.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutItemOnClickAction.java deleted file mode 100644 index ca1cd610..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutItemOnClickAction.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.danielstone.materialaboutlibrary.items; - -public interface MaterialAboutItemOnClickAction { - void onClick(); -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutProfileItem.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutProfileItem.java deleted file mode 100644 index aeb4d4fe..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutProfileItem.java +++ /dev/null @@ -1,352 +0,0 @@ -package com.danielstone.materialaboutlibrary.items; - - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.os.Build; -import androidx.annotation.DrawableRes; -import androidx.annotation.StringRes; - -import android.util.Log; -import android.util.TypedValue; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import com.danielstone.materialaboutlibrary.R; -import com.danielstone.materialaboutlibrary.holders.MaterialAboutItemViewHolder; -import com.danielstone.materialaboutlibrary.util.ViewTypeManager; - -import static android.view.View.GONE; - -public class MaterialAboutProfileItem extends MaterialAboutItem { - - private CharSequence text = null; - private int textRes = 0; - private CharSequence desc = null; - private int descRes = 0; - private Drawable icon = null; - private int iconRes = 0; - private MaterialAboutItemOnClickAction onClickAction = null; - private MaterialAboutItemOnClickAction onLongClickAction = null; - - private MaterialAboutProfileItem(MaterialAboutProfileItem.Builder builder) { - super(); - this.text = builder.text; - this.textRes = builder.textRes; - - this.desc = builder.desc; - this.descRes = builder.descRes; - - this.icon = builder.icon; - this.iconRes = builder.iconRes; - - this.onClickAction = builder.onClickAction; - this.onLongClickAction = builder.onLongClickAction; - } - - public MaterialAboutProfileItem(CharSequence text, CharSequence desc, Drawable icon) { - this.text = text; - this.desc = desc; - this.icon = icon; - } - - public MaterialAboutProfileItem(int textRes, int descRes, int iconRes) { - this.textRes = textRes; - this.descRes = descRes; - this.iconRes = iconRes; - } - - public static MaterialAboutItemViewHolder getViewHolder(View view) { - return new MaterialAboutProfileItem.MaterialAboutProfileItemViewHolder(view); - } - - public static void setupItem(MaterialAboutProfileItemViewHolder holder, MaterialAboutProfileItem item, Context context) { - - CharSequence text = item.getText(); - int textRes = item.getTextRes(); - - holder.text.setVisibility(View.VISIBLE); - if (text != null) { - holder.text.setText(text); - } else if (textRes != 0) { - holder.text.setText(textRes); - } else { - holder.text.setVisibility(GONE); - } - - CharSequence desc = item.getDesc(); - int descRes = item.getDescRes(); - - holder.desc.setVisibility(View.VISIBLE); - if (desc != null) { - holder.desc.setText(desc); - } else if (descRes != 0) { - holder.desc.setText(descRes); - } else { - holder.desc.setVisibility(GONE); - } - - Drawable drawable = item.getIcon(); - int drawableRes = item.getIconRes(); - if (drawable != null) { - holder.icon.setImageDrawable(drawable); - } else if (drawableRes != 0) { - holder.icon.setImageResource(drawableRes); - } - - int pL = 0, pT = 0, pR = 0, pB = 0; - if (Build.VERSION.SDK_INT < 21) { - pL = holder.view.getPaddingLeft(); - pT = holder.view.getPaddingTop(); - pR = holder.view.getPaddingRight(); - pB = holder.view.getPaddingBottom(); - } - - if (item.getOnClickAction() != null || item.getOnLongClickAction() != null) { - TypedValue outValue = new TypedValue(); - context.getTheme().resolveAttribute(R.attr.selectableItemBackground, outValue, true); - holder.view.setBackgroundResource(outValue.resourceId); - } else { - holder.view.setBackgroundResource(0); - } - holder.setOnClickAction(item.getOnClickAction()); - holder.setOnLongClickAction(item.getOnLongClickAction()); - - if (Build.VERSION.SDK_INT < 21) { - holder.view.setPadding(pL, pT, pR, pB); - } - } - - @Override - public int getType() { - return ViewTypeManager.ItemType.PROFILE_ITEM; - } - - @Override - public String getDetailString() { - return "MaterialAboutProfileItem{" + - "text=" + text + - ", textRes=" + textRes + - ", desc=" + desc + - ", descRes=" + descRes + - ", icon=" + icon + - ", iconRes=" + iconRes + - ", onClickAction=" + onClickAction + - ", onLongClickAction=" + onLongClickAction + - '}'; - } - - public MaterialAboutProfileItem(MaterialAboutProfileItem item) { - this.id = item.getId(); - this.text = item.getText(); - this.textRes = item.getTextRes(); - this.desc = item.getDesc(); - this.descRes = item.getDescRes(); - this.icon = item.getIcon(); - this.iconRes = item.getIconRes(); - this.onClickAction = item.getOnClickAction(); - this.onLongClickAction = item.getOnLongClickAction(); - } - - @Override - public MaterialAboutProfileItem clone() { - return new MaterialAboutProfileItem(this); - } - - public CharSequence getText() { - return text; - } - - public MaterialAboutProfileItem setText(CharSequence text) { - this.textRes = 0; - this.text = text; - return this; - } - - public int getTextRes() { - return textRes; - } - - public MaterialAboutProfileItem setTextRes(int textRes) { - this.text = null; - this.textRes = textRes; - return this; - } - - public CharSequence getDesc() { - return desc; - } - - public MaterialAboutProfileItem setDesc(CharSequence desc) { - this.descRes = 0; - this.desc = desc; - return this; - } - - public int getDescRes() { - return descRes; - } - - public MaterialAboutProfileItem setDescRes(int descRes) { - this.desc = null; - this.descRes = textRes; - return this; - } - - public Drawable getIcon() { - return icon; - } - - public MaterialAboutProfileItem setIcon(Drawable icon) { - this.iconRes = 0; - this.icon = icon; - return this; - } - - public int getIconRes() { - return iconRes; - } - - public MaterialAboutProfileItem setIconRes(int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public MaterialAboutItemOnClickAction getOnClickAction() { - return onClickAction; - } - - public MaterialAboutProfileItem setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - return this; - } - - public MaterialAboutItemOnClickAction getOnLongClickAction() { - return onLongClickAction; - } - - public MaterialAboutProfileItem setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - return this; - } - public static class MaterialAboutProfileItemViewHolder extends MaterialAboutItemViewHolder implements View.OnClickListener, View.OnLongClickListener { - public final View view; - public final ImageView icon; - public final TextView text; - public final TextView desc; - private MaterialAboutItemOnClickAction onClickAction; - private MaterialAboutItemOnClickAction onLongClickAction; - - MaterialAboutProfileItemViewHolder(View view) { - super(view); - this.view = view; - icon = (ImageView) view.findViewById(R.id.mal_item_image); - text = (TextView) view.findViewById(R.id.mal_item_text); - desc = (TextView) view.findViewById(R.id.mal_item_desc); - } - - public void setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - if (onClickAction != null) { - view.setOnClickListener(this); - } else { - view.setClickable(false); - } - } - - public void setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - if (onLongClickAction != null) { - view.setOnLongClickListener(this); - } else { - view.setLongClickable(false); - } - } - - @Override - public void onClick(View v) { - if (onClickAction != null) { - onClickAction.onClick(); - } - } - - @Override - public boolean onLongClick(View v) { - if (onLongClickAction != null) { - onLongClickAction.onClick(); - return true; - } - return false; - } - } - - public static class Builder { - - MaterialAboutItemOnClickAction onClickAction = null; - MaterialAboutItemOnClickAction onLongClickAction = null; - private CharSequence text = null; - @StringRes - private int textRes = 0; - private CharSequence desc = null; - @StringRes - private int descRes = 0; - private Drawable icon = null; - @DrawableRes - private int iconRes = 0; - - public MaterialAboutProfileItem.Builder text(CharSequence text) { - this.text = text; - this.textRes = 0; - return this; - } - - - public MaterialAboutProfileItem.Builder text(@StringRes int text) { - this.textRes = text; - this.text = null; - return this; - } - - public MaterialAboutProfileItem.Builder desc(CharSequence desc) { - this.desc = desc; - this.descRes = 0; - return this; - } - - - public MaterialAboutProfileItem.Builder desc(@StringRes int desc) { - this.descRes = desc; - this.desc = null; - return this; - } - - public MaterialAboutProfileItem.Builder icon(Drawable icon) { - this.icon = icon; - this.iconRes = 0; - return this; - } - - - public MaterialAboutProfileItem.Builder icon(@DrawableRes int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public MaterialAboutProfileItem.Builder setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - return this; - } - - public MaterialAboutProfileItem.Builder setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - return this; - } - - public MaterialAboutProfileItem build() { - return new MaterialAboutProfileItem(this); - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutSwitchItem.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutSwitchItem.java deleted file mode 100644 index 4ce55683..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutSwitchItem.java +++ /dev/null @@ -1,548 +0,0 @@ -package com.danielstone.materialaboutlibrary.items; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.os.Build; -import androidx.annotation.DrawableRes; -import androidx.annotation.IntDef; -import androidx.annotation.StringRes; -import androidx.appcompat.widget.SwitchCompat; - -import android.text.Html; -import android.util.Log; -import android.util.TypedValue; -import android.view.Gravity; -import android.view.View; -import android.widget.CompoundButton; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.Switch; -import android.widget.TextView; - -import com.danielstone.materialaboutlibrary.R; -import com.danielstone.materialaboutlibrary.holders.MaterialAboutItemViewHolder; -import com.danielstone.materialaboutlibrary.util.ViewTypeManager; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -import static android.view.View.GONE; - -public class MaterialAboutSwitchItem extends MaterialAboutItem { - - public static final int GRAVITY_TOP = 0; - public static final int GRAVITY_MIDDLE = 1; - public static final int GRAVITY_BOTTOM = 2; - private CharSequence text = null; - private int textRes = 0; - private CharSequence subText = null; - private int subTextRes = 0; - private CharSequence subTextChecked = null; - private int subTextCheckedRes = 0; - private Drawable icon = null; - private int iconRes = 0; - private boolean showIcon = true; - private int iconGravity = GRAVITY_MIDDLE; - private boolean checked = false; - private int tag = -1; - private MaterialAboutItemOnChangeAction onChangeAction = null; - - private MaterialAboutSwitchItem(Builder builder) { - super(); - this.text = builder.text; - this.textRes = builder.textRes; - - this.subText = builder.subText; - this.subTextRes = builder.subTextRes; - - this.subTextChecked = builder.subTextChecked; - this.subTextCheckedRes = builder.subTextCheckedRes; - - this.icon = builder.icon; - this.iconRes = builder.iconRes; - - this.showIcon = builder.showIcon; - - this.iconGravity = builder.iconGravity; - - this.checked = builder.checked; - - this.tag = builder.tag; - - this.onChangeAction = builder.onChangeAction; - } - - public MaterialAboutSwitchItem(CharSequence text, CharSequence subText, Drawable icon, MaterialAboutItemOnChangeAction onChangeAction) { - this.text = text; - this.subText = subText; - this.icon = icon; - this.onChangeAction = onChangeAction; - } - - public MaterialAboutSwitchItem(CharSequence text, CharSequence subText, Drawable icon) { - this.text = text; - this.subText = subText; - this.icon = icon; - } - - public MaterialAboutSwitchItem(int textRes, int subTextRes, int iconRes, MaterialAboutItemOnChangeAction onChangeAction) { - this.textRes = textRes; - this.subTextRes = subTextRes; - this.iconRes = iconRes; - this.onChangeAction = onChangeAction; - } - - public MaterialAboutSwitchItem(int textRes, int subTextRes, int iconRes) { - this.textRes = textRes; - this.subTextRes = subTextRes; - this.iconRes = iconRes; - } - - public static void setupItem(MaterialAboutSwitchItemViewHolder holder, MaterialAboutSwitchItem item, Context context) { - holder.switchItem = item; - - CharSequence text = item.getText(); - int textRes = item.getTextRes(); - - holder.text.setVisibility(View.VISIBLE); - if (text != null) { - holder.text.setText(text); - } else if (textRes != 0) { - holder.text.setText(textRes); - } else { - holder.text.setVisibility(GONE); - } - - CharSequence subText = item.getSubText(); - int subTextRes = item.getSubTextRes(); - - holder.subText.setVisibility(View.VISIBLE); - if (subText != null) { - holder.subText.setText(subText); - } else if (subTextRes != 0) { - holder.subText.setText(subTextRes); - } else { - holder.subText.setVisibility(GONE); - } - - if (item.shouldShowIcon()) { - holder.icon.setVisibility(View.VISIBLE); - Drawable drawable = item.getIcon(); - int drawableRes = item.getIconRes(); - if (drawable != null) { - holder.icon.setImageDrawable(drawable); - } else if (drawableRes != 0) { - holder.icon.setImageResource(drawableRes); - } - } else { - holder.icon.setVisibility(GONE); - } - - LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) holder.icon.getLayoutParams(); - switch (item.getIconGravity()) { - case MaterialAboutSwitchItem.GRAVITY_TOP: - params.gravity = Gravity.TOP; - break; - case MaterialAboutSwitchItem.GRAVITY_MIDDLE: - params.gravity = Gravity.CENTER_VERTICAL; - break; - case MaterialAboutSwitchItem.GRAVITY_BOTTOM: - params.gravity = Gravity.BOTTOM; - break; - } - holder.icon.setLayoutParams(params); - - int pL = 0, pT = 0, pR = 0, pB = 0; - if (Build.VERSION.SDK_INT < 21) { - pL = holder.view.getPaddingLeft(); - pT = holder.view.getPaddingTop(); - pR = holder.view.getPaddingRight(); - pB = holder.view.getPaddingBottom(); - } - - holder.setChecked(item.getChecked()); - - if (item.getOnChangeAction() != null) { - TypedValue outValue = new TypedValue(); - context.getTheme().resolveAttribute(R.attr.selectableItemBackground, outValue, true); - holder.view.setBackgroundResource(outValue.resourceId); - } else { - holder.view.setBackgroundResource(0); - } - holder.setOnChangeAction(item.getOnChangeAction()); - - if (Build.VERSION.SDK_INT < 21) { - holder.view.setPadding(pL, pT, pR, pB); - } - } - - public static MaterialAboutItemViewHolder getViewHolder(View view) { - return new MaterialAboutSwitchItemViewHolder(view); - } - - public static class MaterialAboutSwitchItemViewHolder extends MaterialAboutItemViewHolder implements View.OnClickListener, CompoundButton.OnCheckedChangeListener { - public final View view; - public final ImageView icon; - public final TextView text; - public final TextView subText; - public final SwitchCompat switchView; - private MaterialAboutItemOnChangeAction onChangeAction; - private MaterialAboutSwitchItem switchItem; - - MaterialAboutSwitchItemViewHolder(View view) { - super(view); - this.view = view; - icon = view.findViewById(R.id.mal_item_image); - text = view.findViewById(R.id.mal_item_text); - subText = view.findViewById(R.id.mal_action_item_subtext); - switchView = view.findViewById(R.id.mal_switch); - } - - public void setOnChangeAction(MaterialAboutItemOnChangeAction onChangeAction) { - this.onChangeAction = onChangeAction; - view.setOnClickListener(onChangeAction != null ? this : null); - switchView.setOnCheckedChangeListener(this); - } - - public void setChecked(boolean checked) { - switchView.setOnCheckedChangeListener(null); - switchView.setChecked(checked); - switchView.setOnCheckedChangeListener(this); - switchItem.setChecked(checked); - updateSubText(checked); - } - - public void updateSubText(boolean checked) { - if (checked && switchItem.subTextChecked != null) { - subText.setText(switchItem.subTextChecked); - } - else if (checked && switchItem.subTextCheckedRes != 0) { - subText.setText(switchItem.subTextCheckedRes); - } - else if (switchItem.subText != null) { - subText.setText(switchItem.subText); - } - else if (switchItem.subTextRes != 0) { - subText.setText(switchItem.subTextRes); - } - } - - @Override - public void onClick(View v) { - switchView.toggle(); - } - - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - updateSubText(isChecked); - if (onChangeAction != null) { - if (!onChangeAction.onChange(isChecked, switchItem.getTag())) { - setChecked(!isChecked); - } - else { - switchItem.setChecked(isChecked); - } - } - else { - setChecked(!isChecked); - } - } - } - - @Override - public int getType() { - return ViewTypeManager.ItemType.SWITCH_ITEM; - } - - @Override - public String getDetailString() { - return "MaterialAboutSwitchItem{" + - "text=" + text + - ", textRes=" + textRes + - ", subText=" + subText + - ", subTextRes=" + subTextRes + - ", subTextChecked=" + subTextChecked + - ", subTextCheckedRes=" + subTextCheckedRes + - ", icon=" + icon + - ", iconRes=" + iconRes + - ", showIcon=" + showIcon + - ", iconGravity=" + iconGravity + - ", checked=" + checked + - ", tag=" + tag + - ", onChangeAction=" + onChangeAction + - '}'; - } - - public MaterialAboutSwitchItem(MaterialAboutSwitchItem item) { - this.id = item.getId(); - this.text = item.getText(); - this.textRes = item.getTextRes(); - this.subText = item.getSubText(); - this.subTextRes = item.getSubTextRes(); - this.subTextChecked = item.getSubTextChecked(); - this.subTextCheckedRes = item.getSubTextCheckedRes(); - this.icon = item.getIcon(); - this.iconRes = item.getIconRes(); - this.showIcon = item.showIcon; - this.iconGravity = item.iconGravity; - this.checked = item.checked; - this.tag = item.tag; - this.onChangeAction = item.onChangeAction; - } - - @Override - public MaterialAboutItem clone() { - return new MaterialAboutSwitchItem(this); - } - - public int getTag() { - return tag; - } - public MaterialAboutSwitchItem setTag(int tag) { - this.tag = tag; - return this; - } - - public CharSequence getText() { - return text; - } - public MaterialAboutSwitchItem setText(CharSequence text) { - this.textRes = 0; - this.text = text; - return this; - } - - public int getTextRes() { - return textRes; - } - - public MaterialAboutSwitchItem setTextRes(int textRes) { - this.text = null; - this.textRes = textRes; - return this; - } - - public CharSequence getSubText() { - return subText; - } - - public MaterialAboutSwitchItem setSubText(CharSequence subText) { - this.subTextRes = 0; - this.subText = subText; - return this; - } - - public int getSubTextRes() { - return subTextRes; - } - - public MaterialAboutSwitchItem setSubTextRes(int subTextRes) { - this.subText = null; - this.subTextRes = subTextRes; - return this; - } - - public CharSequence getSubTextChecked() { - return subTextChecked; - } - - public MaterialAboutSwitchItem setSubTextChecked(CharSequence subTextChecked) { - this.subTextCheckedRes = 0; - this.subTextChecked = subTextChecked; - return this; - } - - public int getSubTextCheckedRes() { - return subTextCheckedRes; - } - - public MaterialAboutSwitchItem setSubTextCheckedRes(int subTextCheckedRes) { - this.subTextChecked = null; - this.subTextCheckedRes = subTextCheckedRes; - return this; - } - - public Drawable getIcon() { - return icon; - } - - public MaterialAboutSwitchItem setIcon(Drawable icon) { - this.iconRes = 0; - this.icon = icon; - return this; - } - - public int getIconRes() { - return iconRes; - } - - public MaterialAboutSwitchItem setIconRes(int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public boolean shouldShowIcon() { - return showIcon; - } - - public MaterialAboutSwitchItem setShouldShowIcon(boolean showIcon) { - this.showIcon = showIcon; - return this; - } - - @IconGravity - public int getIconGravity() { - return iconGravity; - } - - public MaterialAboutSwitchItem setIconGravity(int iconGravity) { - this.iconGravity = iconGravity; - return this; - } - - public boolean getChecked() { - return checked; - } - - public MaterialAboutSwitchItem setChecked(boolean checked) { - //Log.d("MaterialItem", "Setting item "+getText()+" to checked "+checked); - this.checked = checked; - return this; - } - - public MaterialAboutItemOnChangeAction getOnChangeAction() { - return onChangeAction; - } - - public MaterialAboutSwitchItem setOnChangeAction(MaterialAboutItemOnChangeAction onChangeAction) { - this.onChangeAction = onChangeAction; - return this; - } - - @Retention(RetentionPolicy.SOURCE) - @IntDef({GRAVITY_TOP, GRAVITY_MIDDLE, GRAVITY_BOTTOM}) - public @interface IconGravity { - } - - public static class Builder { - - MaterialAboutItemOnChangeAction onChangeAction = null; - private CharSequence text = null; - @StringRes - private int textRes = 0; - private CharSequence subText = null; - @StringRes - private int subTextRes = 0; - private CharSequence subTextChecked = null; - @StringRes - private int subTextCheckedRes = 0; - private Drawable icon = null; - @DrawableRes - private int iconRes = 0; - private boolean showIcon = true; - @IconGravity - private int iconGravity = GRAVITY_MIDDLE; - private boolean checked = false; - private int tag = -1; - - public Builder tag(int tag) { - this.tag = tag; - return this; - } - - public Builder text(CharSequence text) { - this.text = text; - this.textRes = 0; - return this; - } - - public Builder text(@StringRes int text) { - this.textRes = text; - this.text = null; - return this; - } - - public Builder subText(CharSequence subText) { - this.subText = subText; - this.subTextRes = 0; - return this; - } - - public Builder subText(@StringRes int subTextRes) { - this.subText = null; - this.subTextRes = subTextRes; - return this; - } - - public Builder subTextHtml(String subTextHtml) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - this.subText = Html.fromHtml(subTextHtml, Html.FROM_HTML_MODE_LEGACY); - } else { - //noinspection deprecation - this.subText = Html.fromHtml(subTextHtml); - } - this.subTextRes = 0; - return this; - } - - public Builder subTextChecked(CharSequence subTextChecked) { - this.subTextChecked = subTextChecked; - this.subTextCheckedRes = 0; - return this; - } - - public Builder subTextChecked(@StringRes int subTextCheckedRes) { - this.subTextChecked = null; - this.subTextCheckedRes = subTextCheckedRes; - return this; - } - - public Builder subTextCheckedHtml(String subTextCheckedHtml) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - this.subTextChecked = Html.fromHtml(subTextCheckedHtml, Html.FROM_HTML_MODE_LEGACY); - } else { - //noinspection deprecation - this.subTextChecked = Html.fromHtml(subTextCheckedHtml); - } - this.subTextCheckedRes = 0; - return this; - } - - public Builder icon(Drawable icon) { - this.icon = icon; - this.iconRes = 0; - return this; - } - - public Builder icon(@DrawableRes int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public Builder showIcon(boolean showIcon) { - this.showIcon = showIcon; - return this; - } - - public Builder setIconGravity(@IconGravity int iconGravity) { - this.iconGravity = iconGravity; - return this; - } - - public Builder setOnChangeAction(MaterialAboutItemOnChangeAction onChangeAction) { - this.onChangeAction = onChangeAction; - return this; - } - - public Builder checked(boolean isChecked) { - this.checked = isChecked; - return this; - } - - public MaterialAboutSwitchItem build() { - return new MaterialAboutSwitchItem(this); - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutTitleItem.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutTitleItem.java deleted file mode 100644 index a1b1bc72..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/items/MaterialAboutTitleItem.java +++ /dev/null @@ -1,400 +0,0 @@ -package com.danielstone.materialaboutlibrary.items; - - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.os.Build; - -import androidx.annotation.ColorInt; -import androidx.annotation.DrawableRes; -import androidx.annotation.StringRes; -import android.util.TypedValue; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import com.danielstone.materialaboutlibrary.R; -import com.danielstone.materialaboutlibrary.holders.MaterialAboutItemViewHolder; -import com.danielstone.materialaboutlibrary.util.ViewTypeManager; - -import static android.view.View.GONE; - -public class MaterialAboutTitleItem extends MaterialAboutItem { - - private CharSequence text = null; - private int textRes = 0; - private CharSequence desc = null; - private int descRes = 0; - private int textColor = -1; - private int descColor = -1; - private Drawable icon = null; - private int iconRes = 0; - private MaterialAboutItemOnClickAction onClickAction = null; - private MaterialAboutItemOnClickAction onLongClickAction = null; - - private MaterialAboutTitleItem(MaterialAboutTitleItem.Builder builder) { - super(); - this.text = builder.text; - this.textRes = builder.textRes; - - this.desc = builder.desc; - this.descRes = builder.descRes; - - this.textColor = builder.textColor; - this.descColor = builder.descColor; - - this.icon = builder.icon; - this.iconRes = builder.iconRes; - - this.onClickAction = builder.onClickAction; - this.onLongClickAction = builder.onLongClickAction; - } - - public MaterialAboutTitleItem(CharSequence text, CharSequence desc, Drawable icon) { - this.text = text; - this.desc = desc; - this.icon = icon; - } - - public MaterialAboutTitleItem(int textRes, int descRes, int iconRes) { - this.textRes = textRes; - this.descRes = descRes; - this.iconRes = iconRes; - } - - public static MaterialAboutItemViewHolder getViewHolder(View view) { - return new MaterialAboutTitleItem.MaterialAboutTitleItemViewHolder(view); - } - - public static void setupItem(MaterialAboutTitleItemViewHolder holder, MaterialAboutTitleItem item, Context context) { - - CharSequence text = item.getText(); - int textRes = item.getTextRes(); - - holder.text.setVisibility(View.VISIBLE); - if (text != null) { - holder.text.setText(text); - } else if (textRes != 0) { - holder.text.setText(textRes); - } else { - holder.text.setVisibility(GONE); - } - - CharSequence desc = item.getDesc(); - int descRes = item.getDescRes(); - - holder.desc.setVisibility(View.VISIBLE); - if (desc != null) { - holder.desc.setText(desc); - } else if (descRes != 0) { - holder.desc.setText(descRes); - } else { - holder.desc.setVisibility(GONE); - } - - if (item.getTextColor() != -1) { - holder.text.setTextColor(item.getTextColor()); - } - if (item.getDescColor() != -1) { - holder.desc.setTextColor(item.getDescColor()); - } - - Drawable drawable = item.getIcon(); - int drawableRes = item.getIconRes(); - if (drawable != null) { - holder.icon.setImageDrawable(drawable); - } else if (drawableRes != 0) { - holder.icon.setImageResource(drawableRes); - } - - int pL = 0, pT = 0, pR = 0, pB = 0; - if (Build.VERSION.SDK_INT < 21) { - pL = holder.view.getPaddingLeft(); - pT = holder.view.getPaddingTop(); - pR = holder.view.getPaddingRight(); - pB = holder.view.getPaddingBottom(); - } - - if (item.getOnClickAction() != null || item.getOnLongClickAction() != null) { - TypedValue outValue = new TypedValue(); - context.getTheme().resolveAttribute(R.attr.selectableItemBackground, outValue, true); - holder.view.setBackgroundResource(outValue.resourceId); - } else { - holder.view.setBackgroundResource(0); - } - holder.setOnClickAction(item.getOnClickAction()); - holder.setOnLongClickAction(item.getOnLongClickAction()); - - if (Build.VERSION.SDK_INT < 21) { - holder.view.setPadding(pL, pT, pR, pB); - } - } - - @Override - public int getType() { - return ViewTypeManager.ItemType.TITLE_ITEM; - } - - @Override - public String getDetailString() { - return "MaterialAboutTitleItem{" + - "text=" + text + - ", textRes=" + textRes + - ", desc=" + desc + - ", descRes=" + descRes + - ", textColor=" + textColor + - ", descColor=" + descColor + - ", icon=" + icon + - ", iconRes=" + iconRes + - ", onClickAction=" + onClickAction + - ", onLongClickAction=" + onLongClickAction + - '}'; - } - - public MaterialAboutTitleItem(MaterialAboutTitleItem item) { - this.id = item.getId(); - this.text = item.getText(); - this.textRes = item.getTextRes(); - this.desc = item.getDesc(); - this.descRes = item.getDescRes(); - this.textColor = item.getTextColor(); - this.descColor = item.getDescColor(); - this.icon = item.getIcon(); - this.iconRes = item.getIconRes(); - this.onClickAction = item.getOnClickAction(); - this.onLongClickAction = item.getOnLongClickAction(); - } - - @Override - public MaterialAboutTitleItem clone() { - return new MaterialAboutTitleItem(this); - } - - public CharSequence getText() { - return text; - } - - public MaterialAboutTitleItem setText(CharSequence text) { - this.textRes = 0; - this.text = text; - return this; - } - - public int getTextRes() { - return textRes; - } - - public MaterialAboutTitleItem setTextRes(int textRes) { - this.text = null; - this.textRes = textRes; - return this; - } - - public CharSequence getDesc() { - return desc; - } - - public MaterialAboutTitleItem setDesc(CharSequence desc) { - this.descRes = 0; - this.desc = desc; - return this; - } - - public int getDescRes() { - return descRes; - } - - public MaterialAboutTitleItem setDescRes(int descRes) { - this.desc = null; - this.descRes = textRes; - return this; - } - - public int getTextColor() { - return textColor; - } - - public MaterialAboutTitleItem setTextColor(int textColor) { - this.textColor = textColor; - return this; - } - - public int getDescColor() { - return descColor; - } - - public MaterialAboutTitleItem setDescColor(int descColor) { - this.descColor = descColor; - return this; - } - - public Drawable getIcon() { - return icon; - } - - public MaterialAboutTitleItem setIcon(Drawable icon) { - this.iconRes = 0; - this.icon = icon; - return this; - } - - public int getIconRes() { - return iconRes; - } - - public MaterialAboutTitleItem setIconRes(int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public MaterialAboutItemOnClickAction getOnClickAction() { - return onClickAction; - } - - public MaterialAboutTitleItem setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - return this; - } - - public MaterialAboutItemOnClickAction getOnLongClickAction() { - return onLongClickAction; - } - - public MaterialAboutTitleItem setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - return this; - } - public static class MaterialAboutTitleItemViewHolder extends MaterialAboutItemViewHolder implements View.OnClickListener, View.OnLongClickListener { - public final View view; - public final ImageView icon; - public final TextView text; - public final TextView desc; - private MaterialAboutItemOnClickAction onClickAction; - private MaterialAboutItemOnClickAction onLongClickAction; - - MaterialAboutTitleItemViewHolder(View view) { - super(view); - this.view = view; - icon = (ImageView) view.findViewById(R.id.mal_item_image); - text = (TextView) view.findViewById(R.id.mal_item_text); - desc = (TextView) view.findViewById(R.id.mal_item_desc); - } - - public void setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - if (onClickAction != null) { - view.setOnClickListener(this); - } else { - view.setClickable(false); - } - } - - public void setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - if (onLongClickAction != null) { - view.setOnLongClickListener(this); - } else { - view.setLongClickable(false); - } - } - - @Override - public void onClick(View v) { - if (onClickAction != null) { - onClickAction.onClick(); - } - } - - @Override - public boolean onLongClick(View v) { - if (onLongClickAction != null) { - onLongClickAction.onClick(); - return true; - } - return false; - } - } - - public static class Builder { - - MaterialAboutItemOnClickAction onClickAction = null; - MaterialAboutItemOnClickAction onLongClickAction = null; - private CharSequence text = null; - @StringRes - private int textRes = 0; - private CharSequence desc = null; - @StringRes - private int descRes = 0; - @ColorInt - private int textColor = -1; - @ColorInt - private int descColor = -1; - private Drawable icon = null; - @DrawableRes - private int iconRes = 0; - - public MaterialAboutTitleItem.Builder text(CharSequence text) { - this.text = text; - this.textRes = 0; - return this; - } - - - public MaterialAboutTitleItem.Builder text(@StringRes int text) { - this.textRes = text; - this.text = null; - return this; - } - - public MaterialAboutTitleItem.Builder desc(CharSequence desc) { - this.desc = desc; - this.descRes = 0; - return this; - } - - - public MaterialAboutTitleItem.Builder desc(@StringRes int desc) { - this.descRes = desc; - this.desc = null; - return this; - } - - public MaterialAboutTitleItem.Builder textColor(@ColorInt int textColor) { - this.textColor = textColor; - return this; - } - - public MaterialAboutTitleItem.Builder descColor(@ColorInt int descColor) { - this.descColor = descColor; - return this; - } - - public MaterialAboutTitleItem.Builder icon(Drawable icon) { - this.icon = icon; - this.iconRes = 0; - return this; - } - - - public MaterialAboutTitleItem.Builder icon(@DrawableRes int iconRes) { - this.icon = null; - this.iconRes = iconRes; - return this; - } - - public MaterialAboutTitleItem.Builder setOnClickAction(MaterialAboutItemOnClickAction onClickAction) { - this.onClickAction = onClickAction; - return this; - } - - public MaterialAboutTitleItem.Builder setOnLongClickAction(MaterialAboutItemOnClickAction onLongClickAction) { - this.onLongClickAction = onLongClickAction; - return this; - } - - public MaterialAboutTitleItem build() { - return new MaterialAboutTitleItem(this); - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/model/MaterialAboutCard.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/model/MaterialAboutCard.java deleted file mode 100644 index ecbffb18..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/model/MaterialAboutCard.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.danielstone.materialaboutlibrary.model; - - -import androidx.annotation.ColorInt; -import androidx.annotation.StringRes; -import androidx.annotation.StyleRes; -import androidx.recyclerview.widget.RecyclerView; - -import com.danielstone.materialaboutlibrary.items.MaterialAboutItem; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.UUID; - -public class MaterialAboutCard { - - private String id = "NO-UUID"; - - private CharSequence title = null; - private int titleRes = 0; - - private int titleColor = 0; - private int cardColor = 0; - - private RecyclerView.Adapter customAdapter = null; - private ArrayList items = new ArrayList<>(); - - - private MaterialAboutCard(Builder builder) { - this.id = UUID.randomUUID().toString(); - this.title = builder.title; - this.titleRes = builder.titleRes; - this.titleColor = builder.titleColor; - this.cardColor = builder.cardColor; - this.items = builder.items; - this.customAdapter = builder.customAdapter; - } - - public MaterialAboutCard(CharSequence title, MaterialAboutItem... materialAboutItems) { - this.title = title; - Collections.addAll(items, materialAboutItems); - } - - public MaterialAboutCard(int titleRes, MaterialAboutItem... materialAboutItems) { - this.titleRes = titleRes; - Collections.addAll(items, materialAboutItems); - } - - public CharSequence getTitle() { - return title; - } - - public int getTitleRes() { - return titleRes; - } - - public int getTitleColor() { - return titleColor; - } - - public int getCardColor() { - return cardColor; - } - - public ArrayList getItems() { - return items; - } - - public static class Builder { - private CharSequence title = null; - @StringRes - private int titleRes = 0; - - @ColorInt - private int titleColor = 0; - - @ColorInt - private int cardColor = 0; - - private ArrayList items = new ArrayList<>(); - private RecyclerView.Adapter customAdapter = null; - - public Builder title(CharSequence title) { - this.title = title; - this.titleRes = 0; - return this; - } - - public Builder title(@StringRes int titleRes) { - this.titleRes = titleRes; - this.title = null; - return this; - } - - public Builder titleColor(@ColorInt int color) { - this.titleColor = color; - return this; - } - - public Builder cardColor(@ColorInt int cardColor) { - this.cardColor = cardColor; - return this; - } - - public Builder addItem(MaterialAboutItem item) { - this.items.add(item); - return this; - } - - public Builder customAdapter(RecyclerView.Adapter customAdapter) { - this.customAdapter = customAdapter; - return this; - } - - public MaterialAboutCard build() { - return new MaterialAboutCard(this); - } - } - - public String getId() { - return id; - } - - public RecyclerView.Adapter getCustomAdapter() { - return customAdapter; - } - - @Override - public String toString() { - String result = "MaterialAboutCard{" + - "id='" + id + '\'' + - ", title=" + title + - ", titleRes=" + titleRes + - ", titleColor=" + titleColor + - ", customAdapter=" + customAdapter + - ", cardColor=" + cardColor + '}'; - return result; - } - - public MaterialAboutCard(MaterialAboutCard card) { - this.id = card.getId(); - this.title = card.getTitle(); - this.titleRes = card.getTitleRes(); - this.titleColor = card.getTitleColor(); - this.cardColor = card.getCardColor(); - this.items = new ArrayList<>(); - this.customAdapter = card.getCustomAdapter(); - for (MaterialAboutItem item : card.items) { - this.items.add(item.clone()); - } - } - public MaterialAboutCard clone() { - return new MaterialAboutCard(this); - } - -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/model/MaterialAboutList.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/model/MaterialAboutList.java deleted file mode 100644 index 910dcc53..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/model/MaterialAboutList.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.danielstone.materialaboutlibrary.model; - - -import java.util.ArrayList; -import java.util.Collections; - -public class MaterialAboutList { - - private ArrayList cards = new ArrayList<>(); - - private MaterialAboutList(Builder builder) { - this.cards = builder.cards; - } - - public MaterialAboutList(MaterialAboutCard... materialAboutCards) { - Collections.addAll(cards, materialAboutCards); - } - - public MaterialAboutList addCard(MaterialAboutCard card) { - cards.add(card); - return this; - } - - public MaterialAboutList clearCards(MaterialAboutCard card) { - cards.clear(); - return this; - } - - public ArrayList getCards() { - return cards; - } - - public static class Builder { - private ArrayList cards = new ArrayList<>(); - - public Builder addCard(MaterialAboutCard card) { - this.cards.add(card); - return this; - } - - public MaterialAboutList build() { - return new MaterialAboutList(this); - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/util/DefaultViewTypeManager.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/util/DefaultViewTypeManager.java deleted file mode 100644 index 8097c972..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/util/DefaultViewTypeManager.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.danielstone.materialaboutlibrary.util; - -import android.content.Context; -import android.view.View; - -import com.danielstone.materialaboutlibrary.holders.MaterialAboutItemViewHolder; -import com.danielstone.materialaboutlibrary.items.MaterialAboutActionItem; -import com.danielstone.materialaboutlibrary.items.MaterialAboutActionSwitchItem; -import com.danielstone.materialaboutlibrary.items.MaterialAboutCheckboxItem; -import com.danielstone.materialaboutlibrary.items.MaterialAboutItem; -import com.danielstone.materialaboutlibrary.items.MaterialAboutProfileItem; -import com.danielstone.materialaboutlibrary.items.MaterialAboutSwitchItem; -import com.danielstone.materialaboutlibrary.items.MaterialAboutTitleItem; - -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemLayout.ACTION_LAYOUT; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemLayout.ACTION_SWITCH_LAYOUT; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemLayout.CHECKBOX_LAYOUT; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemLayout.PROFILE_LAYOUT; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemLayout.SWITCH_LAYOUT; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemLayout.TITLE_LAYOUT; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemType.ACTION_ITEM; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemType.ACTION_SWITCH_ITEM; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemType.CHECKBOX_ITEM; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemType.PROFILE_ITEM; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemType.SWITCH_ITEM; -import static com.danielstone.materialaboutlibrary.util.DefaultViewTypeManager.ItemType.TITLE_ITEM; - -public class DefaultViewTypeManager extends ViewTypeManager { - - public static final class ItemType { - public static final int ACTION_ITEM = ViewTypeManager.ItemType.ACTION_ITEM; - public static final int TITLE_ITEM = ViewTypeManager.ItemType.TITLE_ITEM; - public static final int SWITCH_ITEM = ViewTypeManager.ItemType.SWITCH_ITEM; - public static final int ACTION_SWITCH_ITEM = ViewTypeManager.ItemType.ACTION_SWITCH_ITEM; - public static final int CHECKBOX_ITEM = ViewTypeManager.ItemType.CHECKBOX_ITEM; - public static final int PROFILE_ITEM = ViewTypeManager.ItemType.PROFILE_ITEM; - } - - public static final class ItemLayout { - public static final int ACTION_LAYOUT = ViewTypeManager.ItemLayout.ACTION_LAYOUT; - public static final int TITLE_LAYOUT = ViewTypeManager.ItemLayout.TITLE_LAYOUT; - public static final int SWITCH_LAYOUT = ViewTypeManager.ItemLayout.SWITCH_LAYOUT; - public static final int ACTION_SWITCH_LAYOUT = ViewTypeManager.ItemLayout.ACTION_SWITCH_LAYOUT; - public static final int CHECKBOX_LAYOUT = ViewTypeManager.ItemLayout.CHECKBOX_LAYOUT; - public static final int PROFILE_LAYOUT = ViewTypeManager.ItemLayout.PROFILE_LAYOUT; - } - - public int getLayout(int itemType) { - switch (itemType) { - case ACTION_ITEM: - return ACTION_LAYOUT; - case TITLE_ITEM: - return TITLE_LAYOUT; - case SWITCH_ITEM: - return SWITCH_LAYOUT; - case ACTION_SWITCH_ITEM: - return ACTION_SWITCH_LAYOUT; - case CHECKBOX_ITEM: - return CHECKBOX_LAYOUT; - case PROFILE_ITEM: - return PROFILE_LAYOUT; - default: - return -1; - } - } - - public MaterialAboutItemViewHolder getViewHolder(int itemType, View view) { - switch (itemType) { - case ACTION_ITEM: - return MaterialAboutActionItem.getViewHolder(view); - case TITLE_ITEM: - return MaterialAboutTitleItem.getViewHolder(view); - case SWITCH_ITEM: - return MaterialAboutSwitchItem.getViewHolder(view); - case ACTION_SWITCH_ITEM: - return MaterialAboutActionSwitchItem.getViewHolder(view); - case CHECKBOX_ITEM: - return MaterialAboutCheckboxItem.getViewHolder(view); - case PROFILE_ITEM: - return MaterialAboutProfileItem.getViewHolder(view); - default: - return null; - } - } - - public void setupItem(int itemType, MaterialAboutItemViewHolder holder, MaterialAboutItem item, Context context) { - switch (itemType) { - case ACTION_ITEM: - MaterialAboutActionItem.setupItem((MaterialAboutActionItem.MaterialAboutActionItemViewHolder) holder, (MaterialAboutActionItem) item, context); - break; - case TITLE_ITEM: - MaterialAboutTitleItem.setupItem((MaterialAboutTitleItem.MaterialAboutTitleItemViewHolder) holder, (MaterialAboutTitleItem) item, context); - break; - case SWITCH_ITEM: - MaterialAboutSwitchItem.setupItem((MaterialAboutSwitchItem.MaterialAboutSwitchItemViewHolder) holder, (MaterialAboutSwitchItem) item, context); - break; - case ACTION_SWITCH_ITEM: - MaterialAboutActionSwitchItem.setupItem((MaterialAboutActionSwitchItem.MaterialAboutActionSwitchItemViewHolder) holder, (MaterialAboutActionSwitchItem) item, context); - break; - case CHECKBOX_ITEM: - MaterialAboutCheckboxItem.setupItem((MaterialAboutCheckboxItem.MaterialAboutCheckboxItemViewHolder) holder, (MaterialAboutCheckboxItem) item, context); - break; - case PROFILE_ITEM: - MaterialAboutProfileItem.setupItem((MaterialAboutProfileItem.MaterialAboutProfileItemViewHolder) holder, (MaterialAboutProfileItem) item, context); - break; - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/util/OpenSourceLicense.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/util/OpenSourceLicense.java deleted file mode 100644 index c916b2b6..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/util/OpenSourceLicense.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.danielstone.materialaboutlibrary.util; - -import com.danielstone.materialaboutlibrary.R; - -public enum OpenSourceLicense { - APACHE_2, MIT, GNU_GPL_3, BSD; - - public int getResourceId() { - switch (this) { - case APACHE_2: - return R.string.license_apache2; - case MIT: - return R.string.license_mit; - case GNU_GPL_3: - return R.string.license_gpl; - case BSD: - return R.string.license_bsd; - default: - return -1; - } - } -} diff --git a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/util/ViewTypeManager.java b/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/util/ViewTypeManager.java deleted file mode 100644 index d496dadd..00000000 --- a/material-about-library/src/main/java/com/danielstone/materialaboutlibrary/util/ViewTypeManager.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.danielstone.materialaboutlibrary.util; - -import android.content.Context; -import android.view.View; - -import com.danielstone.materialaboutlibrary.R; -import com.danielstone.materialaboutlibrary.holders.MaterialAboutItemViewHolder; -import com.danielstone.materialaboutlibrary.items.MaterialAboutItem; - -public abstract class ViewTypeManager { - - public static final class ItemType { - public static final int ACTION_ITEM = 0; - public static final int TITLE_ITEM = 1; - public static final int SWITCH_ITEM = 2; - public static final int ACTION_SWITCH_ITEM = 3; - public static final int CHECKBOX_ITEM = 4; - public static final int PROFILE_ITEM = 5; - } - - public static final class ItemLayout { - public static final int ACTION_LAYOUT = R.layout.mal_material_about_action_item; - public static final int TITLE_LAYOUT = R.layout.mal_material_about_title_item; - public static final int SWITCH_LAYOUT = R.layout.mal_material_about_switch_item; - public static final int ACTION_SWITCH_LAYOUT = R.layout.mal_material_about_action_switch_item; - public static final int CHECKBOX_LAYOUT = R.layout.mal_material_about_checkbox_item; - public static final int PROFILE_LAYOUT = R.layout.mal_material_about_profile_item; - } - - public abstract int getLayout(int itemType); - - public abstract MaterialAboutItemViewHolder getViewHolder(int itemType, View view); - - public abstract void setupItem(int itemType, MaterialAboutItemViewHolder holder, MaterialAboutItem item, Context context); -} diff --git a/material-about-library/src/main/res/layout/mal_material_about_action_item.xml b/material-about-library/src/main/res/layout/mal_material_about_action_item.xml deleted file mode 100644 index 5edc81d4..00000000 --- a/material-about-library/src/main/res/layout/mal_material_about_action_item.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/material-about-library/src/main/res/layout/mal_material_about_action_switch_item.xml b/material-about-library/src/main/res/layout/mal_material_about_action_switch_item.xml deleted file mode 100644 index 9e1dd978..00000000 --- a/material-about-library/src/main/res/layout/mal_material_about_action_switch_item.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/material-about-library/src/main/res/layout/mal_material_about_activity.xml b/material-about-library/src/main/res/layout/mal_material_about_activity.xml deleted file mode 100644 index 42f77361..00000000 --- a/material-about-library/src/main/res/layout/mal_material_about_activity.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - diff --git a/material-about-library/src/main/res/layout/mal_material_about_checkbox_item.xml b/material-about-library/src/main/res/layout/mal_material_about_checkbox_item.xml deleted file mode 100644 index 659bbd1f..00000000 --- a/material-about-library/src/main/res/layout/mal_material_about_checkbox_item.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/material-about-library/src/main/res/layout/mal_material_about_fragment.xml b/material-about-library/src/main/res/layout/mal_material_about_fragment.xml deleted file mode 100644 index f8bdb8e0..00000000 --- a/material-about-library/src/main/res/layout/mal_material_about_fragment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/material-about-library/src/main/res/layout/mal_material_about_list_card.xml b/material-about-library/src/main/res/layout/mal_material_about_list_card.xml deleted file mode 100644 index 0d1f73e8..00000000 --- a/material-about-library/src/main/res/layout/mal_material_about_list_card.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/material-about-library/src/main/res/layout/mal_material_about_profile_item.xml b/material-about-library/src/main/res/layout/mal_material_about_profile_item.xml deleted file mode 100644 index a90ccba1..00000000 --- a/material-about-library/src/main/res/layout/mal_material_about_profile_item.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/material-about-library/src/main/res/layout/mal_material_about_switch_item.xml b/material-about-library/src/main/res/layout/mal_material_about_switch_item.xml deleted file mode 100644 index b888bc0f..00000000 --- a/material-about-library/src/main/res/layout/mal_material_about_switch_item.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/material-about-library/src/main/res/layout/mal_material_about_title_item.xml b/material-about-library/src/main/res/layout/mal_material_about_title_item.xml deleted file mode 100644 index e77e04c8..00000000 --- a/material-about-library/src/main/res/layout/mal_material_about_title_item.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/material-about-library/src/main/res/values/attrs.xml b/material-about-library/src/main/res/values/attrs.xml deleted file mode 100644 index 9d555688..00000000 --- a/material-about-library/src/main/res/values/attrs.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/material-about-library/src/main/res/values/colors.xml b/material-about-library/src/main/res/values/colors.xml deleted file mode 100644 index 057f6cb3..00000000 --- a/material-about-library/src/main/res/values/colors.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - #de000000 - #8a000000 - - #ff9b9b9b - \ No newline at end of file diff --git a/material-about-library/src/main/res/values/dimens.xml b/material-about-library/src/main/res/values/dimens.xml deleted file mode 100644 index 06796bac..00000000 --- a/material-about-library/src/main/res/values/dimens.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 16dp - 8dp - - 24dp - 32dp - 40dp - - 4dp - 4dp - - - \ No newline at end of file diff --git a/material-about-library/src/main/res/values/strings.xml b/material-about-library/src/main/res/values/strings.xml deleted file mode 100644 index cbe49a18..00000000 --- a/material-about-library/src/main/res/values/strings.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - About - - Close - Send email - - No apps to handle action - - - "\nCopyright %1$s %2$s\n" - - "\nLicensed under the Apache License, Version 2.0 (the \"License\");" - "you may not use this file except in compliance with the License." - "You may obtain a copy of the License at\n" - - "\nhttp://www.apache.org/licenses/LICENSE-2.0\n" - - "\nUnless required by applicable law or agreed to in writing, software" - "distributed under the License is distributed on an \"AS IS\" BASIS," - "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." - "See the License for the specific language governing permissions and" - "limitations under the License." - - - - "\nMIT License\n" - - "\nCopyright © %1$s %2$s\n" - - "\nPermission is hereby granted, free of charge, to any person obtaining a copy" - "of this software and associated documentation files (the "Software"), to deal" - "in the Software without restriction, including without limitation the rights" - "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell" - "copies of the Software, and to permit persons to whom the Software is" - "furnished to do so, subject to the following conditions:\n" - - "\nThe above copyright notice and this permission notice shall be included in all" - "copies or substantial portions of the Software.\n" - - "\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR" - "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY," - "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE" - "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER" - "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM," - "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE" - "SOFTWARE." - - - - "\nCopyright © %1$s %2$s\n" - - "\nThis 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.\n" - - "\nThis 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.\n" - - "\nYou should have received a copy of the GNU General Public License" - "along with this program. If not, see http://www.gnu.org/licenses.\n" - - - - "\nCopyright © %1$s %2$s\n" - - "\nRedistribution and use in source and binary forms, with or without" - "modification, are permitted provided that the following conditions are met:\n" - - "\n1. Redistributions of source code must retain the above copyright notice, this" - " list of conditions and the following disclaimer.\n" - "2. Redistributions in binary form must reproduce the above copyright notice," - " this list of conditions and the following disclaimer in the documentation" - " and/or other materials provided with the distribution.\n" - - "\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND" - "ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED" - "WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE" - "DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR" - "ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES" - "(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;" - "LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND" - "ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT" - "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS" - "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - - "\nThe views and conclusions contained in the software and documentation are those" - "of the authors and should not be interpreted as representing official policies," - "either expressed or implied, of the FreeBSD Project.\n" - - diff --git a/material-about-library/src/main/res/values/styles.xml b/material-about-library/src/main/res/values/styles.xml deleted file mode 100644 index d0c6188b..00000000 --- a/material-about-library/src/main/res/values/styles.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 22213b80..02529180 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,2 @@ rootProject.name='Szkolny.eu' -include ':app', ':agendacalendarview', ':mhttp', ':material-about-library', ':cafebar', ':szkolny-font', ':nachos', ':community-material' -/* -include ':Navigation' -project(':Navigation').projectDir = new File(settingsDir, '../Navigation/navlib')*/ +include ':app' diff --git a/szkolny-font/build.gradle b/szkolny-font/build.gradle deleted file mode 100644 index 02d6e56b..00000000 --- a/szkolny-font/build.gradle +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2019 Mike Penz - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.android.library' - -apply plugin: 'kotlin-android' - -android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - - defaultConfig { - minSdkVersion rootProject.ext.minSdkVersion - targetSdkVersion rootProject.ext.targetSdkVersion - consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 11 - versionName "1.1" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - debugMinify { - debuggable = true - minifyEnabled = true - proguardFiles 'proguard-android.txt' - } - } -} -if (project.hasProperty('pushall') || project.hasProperty('SzkolnyFontonly')) { - apply from: '../gradle-mvn-push.gradle' -} - -dependencies { - implementation "com.mikepenz:iconics-core:${iconics}" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" -} diff --git a/szkolny-font/consumer-proguard-rules.pro b/szkolny-font/consumer-proguard-rules.pro deleted file mode 100644 index 61d1083d..00000000 --- a/szkolny-font/consumer-proguard-rules.pro +++ /dev/null @@ -1 +0,0 @@ --keep class com.mikepenz.iconics.typeface.library.szkolny.font.SzkolnyFont { *; } diff --git a/szkolny-font/gradle.properties b/szkolny-font/gradle.properties deleted file mode 100644 index 82ee377a..00000000 --- a/szkolny-font/gradle.properties +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright 2014 Mike Penz -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Settings specified in this file will override any Gradle settings -# configured through the IDE. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -VERSION_NAME=1.0 -VERSION_CODE=1 - -POM_NAME=Android-Iconics Szkolny.eu Icon Font Typeface Library -POM_ARTIFACT_ID=szkolny-font-typeface -POM_PACKAGING=aar diff --git a/szkolny-font/src/main/AndroidManifest.xml b/szkolny-font/src/main/AndroidManifest.xml deleted file mode 100644 index e4bf2179..00000000 --- a/szkolny-font/src/main/AndroidManifest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt b/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt deleted file mode 100644 index 5e23dbd1..00000000 --- a/szkolny-font/src/main/java/com/mikepenz/iconics/typeface/library/szkolny/font/SzkolnyFont.kt +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 2019 Mike Penz - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mikepenz.iconics.typeface.library.szkolny.font - -import com.mikepenz.iconics.typeface.IIcon -import com.mikepenz.iconics.typeface.ITypeface -import com.mikepenz.iconics.typeface.library.szkolny.R -import java.util.* - -@Suppress("EnumEntryName") -object SzkolnyFont : ITypeface { - - override val fontRes: Int - get() = R.font.szkolny_font_font_v1_1 - - override val characters: Map by lazy { - Icon.values().associate { it.name to it.character } - } - - override val mappingPrefix: String - get() = "szf" - - override val fontName: String - get() = "Szkolny Font" - - override val version: String - get() = "1.1" - - override val iconCount: Int - get() = characters.size - - override val icons: List - get() = characters.keys.toCollection(LinkedList()) - - override val author: String - get() = "Kuba" - - override val url: String - get() = "" - - override val description: String - get() = "" - - override val license: String - get() = "" - - override val licenseUrl: String - get() = "" - - override fun getIcon(key: String): IIcon = Icon.valueOf(key) - - enum class Icon constructor(override val character: Char) : IIcon { - szf_alarm_bell_outline('\ue800'), - szf_calendar_plus_outline('\ue801'), - szf_calendar_today_outline('\ue802'), - szf_clipboard_list_outline('\ue803'), - szf_delete_empty_outline('\ue804'), - szf_discord_outline('\ue805'), - szf_file_code_outline('\ue806'), - szf_file_excel_outline('\ue807'), - szf_file_image_outline('\ue808'), - szf_file_music_outline('\ue809'), - szf_file_pdf_outline('\ue80a'), - szf_file_percent_outline('\ue80b'), - szf_file_powerpoint_outline('\ue80c'), - szf_file_video_outline('\ue80d'), - szf_file_word_outline('\ue80e'), - szf_message_processing_outline('\ue80f'), - szf_notebook_outline('\ue810'), - szf_zip_box_outline('\ue811'); - - override val typeface: ITypeface by lazy { SzkolnyFont } - } -} \ No newline at end of file diff --git a/szkolny-font/src/main/res/font/szkolny_font_font_v1_1.ttf b/szkolny-font/src/main/res/font/szkolny_font_font_v1_1.ttf deleted file mode 100644 index 33ad627f..00000000 Binary files a/szkolny-font/src/main/res/font/szkolny_font_font_v1_1.ttf and /dev/null differ diff --git a/szkolny-font/src/main/res/values/font_addon.xml b/szkolny-font/src/main/res/values/font_addon.xml deleted file mode 100644 index 3ea04e70..00000000 --- a/szkolny-font/src/main/res/values/font_addon.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/wear/build.gradle b/wear/build.gradle deleted file mode 100644 index 6e4aa162..00000000 --- a/wear/build.gradle +++ /dev/null @@ -1,37 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 28 - - - defaultConfig { - applicationId "pl.szczodrzynski.edziennik" - minSdkVersion 23 - targetSdkVersion 28 - versionCode 1 - versionName "1.0" - multiDexEnabled true - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - compileOptions { - sourceCompatibility = '1.8' - targetCompatibility = '1.8' - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation 'com.google.android.support:wearable:2.4.0' - implementation 'com.google.android.gms:play-services-wearable:16.0.1' - implementation 'androidx.percentlayout:percentlayout:1.0.0-beta01' - implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01' - implementation 'androidx.recyclerview:recyclerview:1.0.0-beta01' - implementation 'androidx.wear:wear:1.0.0-beta01' - compileOnly 'com.google.android.wearable:wearable:2.4.0' -} diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml deleted file mode 100644 index 8148e132..00000000 --- a/wear/src/main/AndroidManifest.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wear/src/main/java/pl/szczodrzynski/edziennik/MainActivity.java b/wear/src/main/java/pl/szczodrzynski/edziennik/MainActivity.java deleted file mode 100644 index b96fff96..00000000 --- a/wear/src/main/java/pl/szczodrzynski/edziennik/MainActivity.java +++ /dev/null @@ -1,153 +0,0 @@ -package pl.szczodrzynski.edziennik; - -import android.app.Activity; -import android.graphics.drawable.Drawable; -import android.os.Bundle; -import androidx.wear.widget.drawer.WearableDrawerLayout; -import androidx.wear.widget.drawer.WearableDrawerView; -import androidx.wear.widget.drawer.WearableNavigationDrawerView; -import android.support.wearable.activity.WearableActivity; -import android.util.Log; -import android.view.View; -import android.widget.ProgressBar; - -import com.google.android.gms.tasks.Task; -import com.google.android.gms.wearable.CapabilityClient; -import com.google.android.gms.wearable.CapabilityInfo; -import com.google.android.gms.wearable.DataEvent; -import com.google.android.gms.wearable.DataItem; -import com.google.android.gms.wearable.Node; -import com.google.android.gms.wearable.PutDataMapRequest; -import com.google.android.gms.wearable.PutDataRequest; -import com.google.android.gms.wearable.Wearable; - -import java.util.Arrays; -import java.util.Set; - -public class MainActivity extends WearableActivity { - - private static final String TAG = "MainActivity"; - private ProgressBar progressBar; - private WearableDrawerLayout wearableDrawerLayout; - private WearableNavigationDrawerView mWearableNavigationDrawer; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - // Enables Always-on - setAmbientEnabled(); - - progressBar = findViewById(R.id.progressBar); - - wearableDrawerLayout = findViewById(R.id.drawer_layout); - wearableDrawerLayout.setDrawerStateCallback(new WearableDrawerLayout.DrawerStateCallback() { - @Override - public void onDrawerOpened(WearableDrawerLayout layout, WearableDrawerView drawerView) { - super.onDrawerOpened(layout, drawerView); - } - - @Override - public void onDrawerClosed(WearableDrawerLayout layout, WearableDrawerView drawerView) { - super.onDrawerClosed(layout, drawerView); - progressBar.setVisibility(View.GONE); - } - }); - - mWearableNavigationDrawer = (WearableNavigationDrawerView) findViewById(R.id.top_navigation_drawer); - WearableNavigationDrawerView.WearableNavigationDrawerAdapter navigationDrawerAdapter = new NavigationDrawerAdapter(this); - mWearableNavigationDrawer.setAdapter(navigationDrawerAdapter); - mWearableNavigationDrawer.addOnItemSelectedListener(new WearableNavigationDrawerView.OnItemSelectedListener() { - @Override - public void onItemSelected(int i) { - //Toast.makeText(MainActivity.this, "Selected item "+i, Toast.LENGTH_SHORT).show(); - progressBar.setVisibility(View.VISIBLE); - } - }); - // Peeks navigation drawer on the top. - mWearableNavigationDrawer.getController().peekDrawer(); - - Wearable.getMessageClient(this).addListener(messageEvent -> { - Log.d(TAG, messageEvent.getPath()+" :: "+ Arrays.toString(messageEvent.getData())); - }); - - Task capabilityInfoTask = - Wearable.getCapabilityClient(this) - .getCapability("edziennik_phone_app", CapabilityClient.FILTER_REACHABLE); - capabilityInfoTask.addOnCompleteListener((task) -> { - if (task.isSuccessful()) { - CapabilityInfo capabilityInfo = task.getResult(); - assert capabilityInfo != null; - Set nodes; - nodes = capabilityInfo.getNodes(); - Log.d(TAG, "Nodes "+nodes); - } else { - Log.d(TAG, "Capability request failed to return any results."); - } - }); - - Wearable.getDataClient(this).addListener(dataEventBuffer -> { - Log.d(TAG, "onDataChanged(): " + dataEventBuffer); - - for (DataEvent event : dataEventBuffer) { - if (event.getType() == DataEvent.TYPE_CHANGED) { - String path = event.getDataItem().getUri().getPath(); - Log.d(TAG, "Data "+path+ " :: "+Arrays.toString(event.getDataItem().getData())); - } - } - }); - - findViewById(R.id.test).setOnClickListener((v -> { - PutDataMapRequest putDataMapRequest = PutDataMapRequest.create("/ping"); - putDataMapRequest.getDataMap().putLong("millis", System.currentTimeMillis()); - - PutDataRequest request = putDataMapRequest.asPutDataRequest(); - request.setData("Hello".getBytes()); - request.setUrgent(); - - Log.d(TAG, "Generating DataItem: " + request); - - Task dataItemTask = - Wearable.getDataClient(getApplicationContext()).putDataItem(request); - dataItemTask.addOnCompleteListener(task -> { - if (task.isSuccessful()) { - - Log.d(TAG, "success"); - } else { - Log.d(TAG, "Capability request failed to return any results."); - } - }); - })); - - - - // Block on a task and get the result synchronously (because this is on a background - // thread). - //DataItem dataItem = dataItemTask.getResult(); - - //Log.d(TAG, "DataItem saved: " + dataItem); - - } - - - private class NavigationDrawerAdapter extends WearableNavigationDrawerView.WearableNavigationDrawerAdapter { - public NavigationDrawerAdapter(Activity activity) { - - } - - @Override - public CharSequence getItemText(int i) { - return "Item "+i; - } - - @Override - public Drawable getItemDrawable(int i) { - return null; - } - - @Override - public int getCount() { - return 5; - } - } -} diff --git a/wear/src/main/res/layout/activity_main.xml b/wear/src/main/res/layout/activity_main.xml deleted file mode 100644 index 83b1a1ef..00000000 --- a/wear/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - -