Skip to content

Commit

Permalink
Merge pull request #185 from tokudai0000/179-modify-new-homepage
Browse files Browse the repository at this point in the history
179 modify new homepage
  • Loading branch information
akidon0000 authored Mar 17, 2024
2 parents d1d1b67 + 262bebb commit 6152506
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion univIP/Common/Url.swift
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ enum Url: String, CaseIterable, UrlProtocol {
/// TwitterのURL
case officialSNS = "https://twitter.com/tokumemo0000"
/// ホームページのURL
case homePage = "https://lit.link/developers"
case homePage = "https://tokumemo.notion.site/6e750dcdc6d544a9a23460503d88ca5d"
/// トクメモ+のプライバシーポリシーURL[GitHub]
case privacyPolicy = "https://tokudai0000.github.io/tokumemo_resource/document/privacy_policy.txt"
/// トクメモ+の利用規約URL[GitHub]
Expand Down
8 changes: 5 additions & 3 deletions univIP/Module/Web/WebViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Foundation
import RxRelay
import RxSwift
import Entity
import AkidonComponents

protocol WebViewModelInterface: AnyObject {
var input: WebViewModel.Input { get }
Expand Down Expand Up @@ -110,11 +111,9 @@ final class WebViewModel: BaseViewModel<WebViewModel>, WebViewModelInterface {

input.urlPendingLoad
.subscribe { url in
guard let url = url.element,
let host = url.host else {
guard let url = url.element else {
return
}
urlLabel.accept(host.description)

if URLCheckers.isUniversityServiceTimeoutURL(at: url.absoluteString) {
reloadLoginURLInWebView.accept(Void())
Expand All @@ -125,9 +124,12 @@ final class WebViewModel: BaseViewModel<WebViewModel>, WebViewModelInterface {
input.urlDidLoad
.subscribe { url in
guard let url = url.element,
let host = url.host,
let canExecuteJavascript = state.canExecuteJavascript.value else {
return
}
urlLabel.accept(host.description)
AKLog(level: .DEBUG, message: "urlDidLoad: \(url)")

if URLCheckers.isSkipReminderURL(at: url.absoluteString) {
skipReminderJavaScriptInjection.accept(Void())
Expand Down

0 comments on commit 6152506

Please sign in to comment.