Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions androidVariant/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<application
android:name=".VariantApp"
android:label="Variant"
android:allowBackup="false"
android:supportsRtl="true"
android:theme="@style/AppTheme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
6AA598482DE72E910078CC9F /* ServerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerView.swift; sourceTree = "<group>"; };
6AA5984B2DE72EF40078CC9F /* Fixtures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fixtures.swift; sourceTree = "<group>"; };
6AA5984F2DE73A8F0078CC9F /* EditServerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditServerView.swift; sourceTree = "<group>"; };
7555FF7B242A565900829871 /* iosVariant.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosVariant.app; sourceTree = BUILT_PRODUCTS_DIR; };
7555FF7B242A565900829871 /* Variant.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Variant.app; sourceTree = BUILT_PRODUCTS_DIR; };
7555FF82242A565900829871 /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
B62AADC22DFDDF01000BCC0C /* DirectoryEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectoryEntry.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -110,7 +110,7 @@
7555FF7C242A565900829871 /* Products */ = {
isa = PBXGroup;
children = (
7555FF7B242A565900829871 /* iosVariant.app */,
7555FF7B242A565900829871 /* Variant.app */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -201,9 +201,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
7555FF7A242A565900829871 /* iosVariant */ = {
7555FF7A242A565900829871 /* Variant */ = {
isa = PBXNativeTarget;
buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosVariant" */;
buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Variant" */;
buildPhases = (
7555FFB5242A651A00829871 /* ShellScript */,
7555FF77242A565900829871 /* Sources */,
Expand All @@ -215,9 +215,9 @@
);
dependencies = (
);
name = iosVariant;
name = Variant;
productName = iosVariant;
productReference = 7555FF7B242A565900829871 /* iosVariant.app */;
productReference = 7555FF7B242A565900829871 /* Variant.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -235,7 +235,7 @@
};
};
};
buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosVariant" */;
buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "Variant" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
Expand All @@ -252,7 +252,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
7555FF7A242A565900829871 /* iosVariant */,
7555FF7A242A565900829871 /* Variant */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -447,17 +447,19 @@
"$(SRCROOT)/../Variant/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
);
INFOPLIST_FILE = iosVariant/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "ComiXed Variant";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.1.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Variant,
);
PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosVariant;
PRODUCT_BUNDLE_IDENTIFIER = org.comixedproject.iosVariant;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -477,17 +479,19 @@
"$(SRCROOT)/../Variant/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
);
INFOPLIST_FILE = iosVariant/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "ComiXed Variant";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.1.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Variant,
);
PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosVariant;
PRODUCT_BUNDLE_IDENTIFIER = org.comixedproject.iosVariant;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -497,7 +501,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
7555FF76242A565900829871 /* Build configuration list for PBXProject "iosVariant" */ = {
7555FF76242A565900829871 /* Build configuration list for PBXProject "Variant" */ = {
isa = XCConfigurationList;
buildConfigurations = (
7555FFA3242A565B00829871 /* Debug */,
Expand All @@ -506,7 +510,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosVariant" */ = {
7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Variant" */ = {
isa = XCConfigurationList;
buildConfigurations = (
7555FFA6242A565B00829871 /* Debug */,
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Data/ImageLoader.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import KMPObservableViewModelSwiftUI
import SwiftUI
import Variant
import shared

private let TAG = "ImageLoader"

Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Data/KMPObservableViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
*/

import KMPObservableViewModelCore
import Variant
import shared

extension Kmp_observableviewmodel_coreViewModel: ViewModel { }
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/HomeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import KMPObservableViewModelSwiftUI
import SwiftUI
import Variant
import shared

private let TAG = "HomeView"

Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Koin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses>
*/

import Variant
import shared

final class Koin {
private var core: Koin_coreKoin?
Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Models/DirectoryEntry.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses>
*/

import Variant
import shared

extension DirectoryEntry : @retroactive Identifiable {
public var id: String {
Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Testing/Fixtures.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses>
*/

import Variant
import shared

public var DIRECTORY_LIST = [
DirectoryEntry(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import KMPObservableViewModelSwiftUI
import SwiftUI
import Variant
import shared

private let TAG = "ComicBookListItemView"

Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Views/Comics/ComicBookListView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import KMPObservableViewModelSwiftUI
import SwiftUI
import Variant
import shared

private let TAG = "ComicBookListView"

Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Views/Comics/ComicBooksView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import KMPObservableViewModelSwiftUI
import SwiftUI
import Variant
import shared

struct ComicBooksView: View {
@EnvironmentViewModel var variantViewModel: VariantViewModel
Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Views/Servers/BrowseServerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import KMPObservableViewModelSwiftUI
import SwiftUI
import Variant
import shared

private let TAG = "BrowseServerView"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import SwiftUI
import Variant
import shared

private let TAG = "DirectoryItemView"

Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Views/Servers/FileItemView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import SwiftUI
import Variant
import shared

private let TAG = "FileItemView"

Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Views/Servers/ServerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import KMPObservableViewModelSwiftUI
import SwiftUI
import Variant
import shared

private let TAG = "ServerView"

Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Views/Settings/EditServerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import KMPObservableViewModelSwiftUI
import SwiftUI
import Variant
import shared

private let TAG = "EditServerView"

Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/Views/Settings/SettingsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import KMPObservableViewModelSwiftUI
import SwiftUI
import Variant
import shared

private let TAG = "SettingsView"

Expand Down
2 changes: 1 addition & 1 deletion iosVariant/iosVariant/iOSApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import Foundation
import KMPObservableViewModelSwiftUI
import SwiftUI
import Variant
import shared

private let TAG = "IOSApp"

Expand Down
2 changes: 1 addition & 1 deletion shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ kotlin {
iosSimulatorArm64()
).forEach {
it.binaries.framework {
baseName = "Variant"
baseName = "shared"
}
}

Expand Down