Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev ios to master #635

Closed
wants to merge 90 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
fe55240
disabled ios firebase
110 Nov 22, 2024
9843cea
on the profile page, if user is logged in, then block/menu/navigation…
110 Nov 22, 2024
ea5e7ea
import profile images
110 Nov 22, 2024
3dfe95a
change profile icon
110 Nov 22, 2024
0025854
change profile icon
110 Nov 22, 2024
16d53ce
change local images to swiftgen model to use
110 Nov 25, 2024
56de1aa
add profile tabbar files
110 Nov 25, 2024
7c2cf41
Merge branch 'master' into dev_ios
110 Nov 25, 2024
5f5a5f1
fix: correct navigation to ProfileMediaListScreen from TabBar profile
110 Nov 26, 2024
4b1fc6a
feat(iOS): enhance ProfileMediaListScreen with waterfall layout and m…
110 Nov 26, 2024
08fa028
import videoplayer controller
110 Nov 27, 2024
f9c27a4
add setting--status-- clear image cache
110 Nov 27, 2024
f0c6c93
Update storage screen with better cache management
110 Nov 27, 2024
588bf9a
Improve media preview component implementation
110 Nov 27, 2024
bc5212a
replace networkimage to kingfisher. better manager image cache.
110 Nov 28, 2024
c150219
Modify directory structure
110 Nov 28, 2024
cf2d5d8
Merge branch 'master' into dev_ios
110 Nov 28, 2024
e41f119
update generate package public access
110 Nov 28, 2024
5fde04c
import tab icon
110 Nov 28, 2024
565270c
change app tabbar icon and spit appbar to single file . and set curr…
110 Nov 28, 2024
993e2b2
implement home screen nested tab navigation
110 Nov 28, 2024
ec1404b
add swift lint config
110 Dec 2, 2024
2527c86
refactor(UI): improve instance selection card design
110 Dec 2, 2024
4f7b878
feat: enhance media preview with JXPhotoBrowser and optimize grid layout
110 Dec 2, 2024
00de5fc
feat: 【Debug】implement dependency injection and configuration management
110 Dec 2, 2024
85efc8b
format time
110 Dec 2, 2024
a5091ba
Merge branch 'master' into dev_ios
110 Dec 2, 2024
350769d
set java_home for java_21
110 Dec 2, 2024
f5912ae
feat(ios): UI improvements and profile layout enhancements
110 Dec 3, 2024
c326e06
Merge branch 'master' into dev_ios
110 Dec 4, 2024
a0d8819
optimize image grid layout for different image counts
110 Dec 4, 2024
50a376b
Modify tweet media layout and preview
110 Dec 5, 2024
0ec2362
feat(ios): Implement Tab Settings and Add New Tab Pages
110 Dec 6, 2024
e2b55c7
fixed appbar all item load when app startup
110 Dec 6, 2024
23b65e6
Modify directory structure
110 Dec 7, 2024
010535b
修改 tweetx 渲染,但是有些问题,暂止保存提交
110 Dec 11, 2024
0540839
Merge branch 'master' into dev_ios
110 Dec 13, 2024
bdc57ec
reset ktor version
110 Dec 14, 2024
a377dcf
FLTabSettings , appbar appbar manager show ok,but some errors need to…
110 Dec 14, 2024
13dcbb5
change appbar bugs
110 Dec 16, 2024
d87a175
Merge branch 'master' into dev_ios
110 Dec 16, 2024
c7348bf
change appbar presenter
110 Dec 16, 2024
e167453
fixed appbar force refresh when appbar item selected.
110 Dec 17, 2024
cb4b01f
fixed Localizable.xcstrings key name on codes.
110 Dec 17, 2024
6e311bd
fixed quoted images click preview error.
110 Dec 17, 2024
2dd532b
rename some file name
110 Dec 17, 2024
4f94185
change appbar setting ui
110 Dec 17, 2024
050b2ad
add appbar setting store
110 Dec 18, 2024
4a181d5
add origin image show
110 Dec 18, 2024
841fa60
add image origin image download or share
110 Dec 18, 2024
c453f75
add image origin image download or share
110 Dec 18, 2024
3373246
add image origin image download or share
110 Dec 18, 2024
271d08e
add image origin image download or share
110 Dec 18, 2024
5204f52
fixed video show sensitive info when sensitive media
110 Dec 19, 2024
b52b7ff
Modify the bottom action
110 Dec 19, 2024
d973dcb
add translate/auto translate and auto translate setting
110 Dec 19, 2024
4bc3326
add translate/auto translate and auto translate setting
110 Dec 19, 2024
6918bc4
disabled logs
110 Dec 20, 2024
75c1fb5
Adjust the tweet bottom label
110 Dec 20, 2024
fda351a
add colors
110 Dec 20, 2024
1127cb1
update colors
110 Dec 20, 2024
69de8ba
fixed bugs
110 Dec 20, 2024
338164d
set dart theme background
110 Dec 23, 2024
be471d7
add profile reply like ...tab
110 Dec 24, 2024
bef0217
add jx pagingview
110 Dec 24, 2024
29c3ec8
add profile tabviews
110 Dec 27, 2024
5d89813
bak code before replace profile presenter
110 Jan 2, 2025
de2ba92
profile tabs use FLUserProfileSettings.swift presenters
110 Jan 2, 2025
5b5f5c3
remove unused code
110 Jan 2, 2025
7c60452
remove unused code
110 Jan 2, 2025
48a46c9
add media to profile tabs
110 Jan 3, 2025
7299862
refactor: integrate media list into profile tab
110 Jan 3, 2025
422027e
delete unused code
110 Jan 3, 2025
753430e
update profile page code
110 Jan 3, 2025
e58d2f2
Merge branch 'master' into dev_ios
110 Jan 6, 2025
e0faf48
fixed bugs
110 Jan 6, 2025
116a09e
fixed no login home timeline
110 Jan 6, 2025
3a5b81b
fixed bugs
110 Jan 6, 2025
8596a57
fixed bugs
110 Jan 6, 2025
382a9cf
Improve performance for ServiceSelectScreen.swift
110 Jan 6, 2025
04e4e0f
fixed video stop when preview close
110 Jan 6, 2025
fe67d81
Merge branch 'master' into dev_ios
110 Jan 6, 2025
498e27a
fixed kt code check
110 Jan 6, 2025
9ca9468
fixed kt code check again
110 Jan 7, 2025
33a582e
add test profile code
110 Jan 7, 2025
cef10d4
profile banner iamge ignoresSafeArea
110 Jan 8, 2025
6ef5ee1
copy old profile header to new profile page ,but profile tabview not …
110 Jan 8, 2025
569de0c
new profile header +tabview ok
110 Jan 9, 2025
0be9a10
profile page is ok ,but header needs replace swiftui header.
110 Jan 12, 2025
b6f4cc7
add swiftlint rules
110 Jan 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ iosApp/iosApp.xcworkspace/*
iosApp/iosApp.xcodeproj/*
!iosApp/iosApp.xcodeproj/project.pbxproj
shared/shared.podspec
.kotlin
.kotlin
.history
.lh
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx8192m -Dfile.encoding=UTF-8
android.useAndroidX=true
kotlin.code.style=official
android.nonTransitiveRClass=true
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ kotlinx-collections-immutable = "0.3.8"
kotlinx-serialization = "1.7.3"
coil3 = "3.0.4"
ktorfit = "2.2.0"
ktor = "3.0.3"
ktor = "3.0.1"
reorderable = "2.4.2"
stately = "2.1.0"
twitter-parser = "0.5.3"
Expand Down
28 changes: 28 additions & 0 deletions iosApp/.swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,30 @@
cyclomatic_complexity:
ignores_case_statements: true

disabled_rules:
- force_cast
- identifier_name
- line_length
- file_length
- function_body_length
- function_parameter_count

# 排除第三方库的检查
excluded:
- Pods
- Carthage
- DerivedData
- .build
- build
- vendor
- Frameworks

# 如果你后续想启用line_length规则但是想调整长度限制,可以使用下面的配置
# line_length:
# warning: 250
# error: 300

# 如果你后续想启用file_length规则但是想调整长度限制,可以使用下面的配置
# file_length:
# warning: 500
# error: 1200
7 changes: 7 additions & 0 deletions iosApp/Configuration/Debug.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include "Config.xcconfig"

// Debug configuration
OTHER_LDFLAGS = $(inherited) -lsqlite3 -framework shared -Xlinker -interposable

// Disable script sandboxing for development
ENABLE_USER_SCRIPT_SANDBOXING = NO
3 changes: 3 additions & 0 deletions iosApp/Configuration/Release.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "Config.xcconfig"

OTHER_LDFLAGS = $(inherited) -lsqlite3 -framework shared
22 changes: 22 additions & 0 deletions iosApp/Generated/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// swift-tools-version: 5.8
import PackageDescription

let package = Package(
name: "Generated",
platforms: [
.iOS(.v14)
],
products: [
.library(
name: "Generated",
targets: ["Generated"]),
],
dependencies: [],
targets: [
.target(
name: "Generated",
dependencies: [],
path: "Sources"
)
]
)
510 changes: 510 additions & 0 deletions iosApp/Generated/Sources/Assets.swift

Large diffs are not rendered by default.

1,280 changes: 1,020 additions & 260 deletions iosApp/iosApp.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion iosApp/iosApp/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AppDelegate: NSObject, ApplicationDelegate {
#else
func application(_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
FirebaseApp.configure()
// FirebaseApp.configure()
return true
}
#endif
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFF",
"green" : "0xFF",
"red" : "0xFF"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x20",
"green" : "0x1A",
"red" : "0x18"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF9",
"green" : "0xF8",
"red" : "0xF7"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x34",
"green" : "0x2A",
"red" : "0x26"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "0.850",
"blue" : "0xF9",
"green" : "0xF8",
"red" : "0xF7"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "0.850",
"blue" : "0x34",
"green" : "0x2A",
"red" : "0x26"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFF",
"green" : "0xFF",
"red" : "0xFF"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x34",
"green" : "0x2A",
"red" : "0x26"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF9",
"green" : "0xF8",
"red" : "0xF7"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x20",
"green" : "0x1A",
"red" : "0x18"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
9 changes: 9 additions & 0 deletions iosApp/iosApp/Assets.xcassets/Color/Background/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"provides-namespace" : true
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF8",
"green" : "0xF8",
"red" : "0xF8"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x18",
"green" : "0x18",
"red" : "0x18"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x15",
"green" : "0x15",
"red" : "0x15"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading