Skip to content

Commit

Permalink
Merge pull request #87 from NatLibFi/ekirjasto-117-update-app-remote-…
Browse files Browse the repository at this point in the history 
…html-resources

EKIRJASTO-117 Update app remote HTML resources + increase project version to 1.2.1
  • Loading branch information
@natlibfi-ptalosel
natlibfi-ptalosel authored Jan 24, 2025
2 parents 7533edd + 7193fe8 commit 962ce79
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 147 deletions.
60 changes: 30 additions & 30 deletions Palace.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5712,7 +5712,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -5777,7 +5777,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PROVISIONING_PROFILE_SPECIFIER = "Ad Hoc";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -5831,7 +5831,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "Palace-noDRM";
Expand Down Expand Up @@ -6026,7 +6026,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -6091,7 +6091,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PROVISIONING_PROFILE_SPECIFIER = "Ad Hoc";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -6145,7 +6145,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "Palace-noDRM";
Expand Down Expand Up @@ -6340,7 +6340,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -6405,7 +6405,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PROVISIONING_PROFILE_SPECIFIER = "Ad Hoc";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -6459,7 +6459,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "Palace-noDRM";
Expand Down Expand Up @@ -6654,7 +6654,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -6719,7 +6719,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PROVISIONING_PROFILE_SPECIFIER = "Ad Hoc";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -6773,7 +6773,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "Palace-noDRM";
Expand Down Expand Up @@ -6964,7 +6964,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -7026,7 +7026,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PROVISIONING_PROFILE_SPECIFIER = "App Store";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -7080,7 +7080,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "Palace-noDRM";
Expand Down Expand Up @@ -7267,7 +7267,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -7329,7 +7329,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PROVISIONING_PROFILE_SPECIFIER = "App Store";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -7383,7 +7383,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "Palace-noDRM";
Expand Down Expand Up @@ -7570,7 +7570,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -7632,7 +7632,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PROVISIONING_PROFILE_SPECIFIER = "App Store";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -7686,7 +7686,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "Palace-noDRM";
Expand Down Expand Up @@ -7873,7 +7873,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -7935,7 +7935,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PROVISIONING_PROFILE_SPECIFIER = "App Store";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -7989,7 +7989,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "Palace-noDRM";
Expand Down Expand Up @@ -8245,7 +8245,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -8307,7 +8307,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -8363,7 +8363,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "Palace-noDRM";
Expand Down Expand Up @@ -8421,7 +8421,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PRODUCT_MODULE_NAME = Palace;
PRODUCT_NAME = "Palace-noDRM";
Expand Down Expand Up @@ -8611,7 +8611,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PROVISIONING_PROFILE_SPECIFIER = "Ad Hoc";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down Expand Up @@ -8671,7 +8671,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.4;
MARKETING_VERSION = 1.2.1;
PRODUCT_BUNDLE_IDENTIFIER = "fi.kansalliskirjasto.e-kirjasto";
PROVISIONING_PROFILE_SPECIFIER = "App Store";
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down
12 changes: 6 additions & 6 deletions Palace/Settings/NewSettings/TPPSettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ struct TPPSettingsView: View {
privacyRow
softwareLicensesRow
userAgreementRow
faqRow
instructionsRow
preferencesRow
}
}
Expand Down Expand Up @@ -292,18 +292,18 @@ struct TPPSettingsView: View {
)
}

@ViewBuilder private var faqRow: some View {
@ViewBuilder private var instructionsRow: some View {
navigationLinkRow(
title: Strings.Settings.faq,
title: Strings.Settings.instructions,
index: 6,
selection: $selectedView,
destination: remoteHTMLView(
url: TPPSettings.TPPFAQURLString,
title: Strings.Settings.faq
url: TPPSettings.TPPInstructionsURLString,
title: Strings.Settings.instructions
).anyView()
)
}

@ViewBuilder private var preferencesRow: some View {
navigationLinkRow(
title: Strings.Preferences.preferencesButton,
Expand Down
Loading

0 comments on commit 962ce79

Please sign in to comment.