Skip to content

Commit

Permalink
Merge branch release/1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rakuyoMo committed Jan 23, 2024
2 parents c61a0e9 + 7fe76be commit f98d0d0
Show file tree
Hide file tree
Showing 66 changed files with 680 additions and 1,675 deletions.
435 changes: 435 additions & 0 deletions Demo/RaLogDemo.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"pins" : [
{
"identity" : "snapkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SnapKit/SnapKit.git",
"state" : {
"revision" : "e74fe2a978d1216c3602b129447c7301573cc2d8",
"version" : "5.7.0"
}
},
{
"identity" : "then",
"kind" : "remoteSourceControl",
"location" : "https://github.com/devxoul/Then.git",
"state" : {
"revision" : "d41ef523faef0f911369f79c0b96815d9dbb6d7a",
"version" : "3.0.0"
}
}
],
"version" : 2
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// AnotherController.swift
// Examples
// RaLogDemo
//
// Created by MBCore on 2020/9/2.
// Copyright © 2020 Rakuyo. All rights reserved.
// Created by Rakuyo on 2020/9/2.
// Copyright © 2024 Rakuyo. All rights reserved.
//

import UIKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// AppDelegate.swift
// RaLogExamples
// RaLogDemo
//
// Created by Rakuyo on 2020/09/02.
// Copyright © 2020 Rakuyo. All rights reserved.
// Created by Rakuyo on 2020/9/2.
// Copyright © 2024 Rakuyo. All rights reserved.
//

import UIKit
Expand Down
122 changes: 122 additions & 0 deletions Demo/RaLogDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"images" : [
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"filename" : "icon-29.png",
"idiom" : "iphone",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"filename" : "[email protected]",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"filename" : "icon-20-ipad.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"filename" : "[email protected]",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "icon-29-ipad.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "[email protected]",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "icon-40.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"filename" : "[email protected]",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "icon-76.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"filename" : "[email protected]",
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"filename" : "[email protected]",
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"filename" : "icon-1024.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,39 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_5" orientation="portrait" appearance="light"/>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Bgg-yt-ure">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<scene sceneID="TGC-Ue-Sm5">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<viewController id="Bgg-yt-ure" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="bQq-MW-jXz">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch" translatesAutoresizingMaskIntoConstraints="NO" id="hmN-dk-DMf">
<rect key="frame" x="57" y="298" width="300" height="300"/>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch" translatesAutoresizingMaskIntoConstraints="NO" id="gDo-6G-7k0">
<rect key="frame" x="46.666666666666657" y="276" width="300" height="300"/>
<constraints>
<constraint firstAttribute="width" constant="300" id="NM2-p7-Qdr"/>
<constraint firstAttribute="width" secondItem="hmN-dk-DMf" secondAttribute="height" multiplier="1:1" id="k9j-vf-Rkw"/>
<constraint firstAttribute="width" secondItem="gDo-6G-7k0" secondAttribute="height" multiplier="1:1" id="eYc-es-Tlh"/>
<constraint firstAttribute="width" constant="300" id="qif-RC-c0y"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" red="0.2627450980392157" green="0.4392156862745098" blue="0.52156862745098043" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<viewLayoutGuide key="safeArea" id="wZM-RB-0kt"/>
<color key="backgroundColor" red="0.26274509800000001" green="0.43921568630000002" blue="0.52156862749999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="hmN-dk-DMf" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="jbG-r7-gVw"/>
<constraint firstItem="hmN-dk-DMf" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="kRO-hV-ael"/>
<constraint firstItem="gDo-6G-7k0" firstAttribute="centerY" secondItem="bQq-MW-jXz" secondAttribute="centerY" id="8Jr-YL-SmL"/>
<constraint firstItem="gDo-6G-7k0" firstAttribute="centerX" secondItem="bQq-MW-jXz" secondAttribute="centerX" id="gmn-Vu-cKn"/>
</constraints>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="ZWs-z5-3ck" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="52.173913043478265" y="375"/>
</scene>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
</dict>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// LogListViewController.swift
// Examples
// RaLogDemo
//
// Created by MBCore on 2020/9/2.
// Copyright © 2020 Rakuyo. All rights reserved.
// Created by Rakuyo on 2020/9/2.
// Copyright © 2024 Rakuyo. All rights reserved.
//

import UIKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// Logger.swift
// Examples
// RaLogDemo
//
// Created by MBCore on 2020/9/2.
// Copyright © 2020 Rakuyo. All rights reserved.
// Created by Rakuyo on 2020/9/2.
// Copyright © 2024 Rakuyo. All rights reserved.
//

import RaLog
Expand Down
4 changes: 2 additions & 2 deletions Examples/Examples/Model.swift → Demo/RaLogDemo/Model.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// Model.swift
// RaLogExamples
// RaLogDemo
//
// Created by Rakuyo on 2020/09/02.
// Copyright © 2020 Rakuyo. All rights reserved.
// Copyright © 2024 Rakuyo. All rights reserved.
//

import UIKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// ViewController.swift
// RaLogExamples
// RaLogDemo
//
// Created by Rakuyo on 2020/09/02.
// Copyright © 2020 Rakuyo. All rights reserved.
// Created by Rakuyo on 2020/9/2.
// Copyright © 2024 Rakuyo. All rights reserved.
//

import UIKit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// ViewModel.swift
// RaLogExamples
// RaLogDemo
//
// Created by Rakuyo on 2020/09/02.
// Copyright © 2020 Rakuyo. All rights reserved.
// Copyright © 2024 Rakuyo. All rights reserved.
//

import UIKit
Expand Down
Loading

0 comments on commit f98d0d0

Please sign in to comment.