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.

Sign up for GitHub

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

🩹 [1.4.1] Fix logcat seach result hitbox #8

Merged
merged 8 commits into from
May 26, 2024
Merged

🩹 [1.4.1] Fix logcat seach result hitbox #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
42e725b
Fix bug with hit box of search in logcat
ThomasBernard03 May 26, 2024
0872d07
Update main.yml
ThomasBernard03 May 26, 2024
56c57b9
Update main.yml
ThomasBernard03 May 26, 2024
669de53
Update main.yml
ThomasBernard03 May 26, 2024
5ab6f63
Update main.yml
ThomasBernard03 May 26, 2024
5d24e4a
Update home
ThomasBernard03 May 26, 2024
ab8e46a
Revert workflow
ThomasBernard03 May 26, 2024
8805037
Bump version
ThomasBernard03 May 26, 2024
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: 0 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,3 @@ jobs:
path: |
${{github.workspace}}/build/*.pkg
${{github.workspace}}/build/*.app

8 changes: 4 additions & 4 deletions AndroidTools/AndroidTools.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_ASSET_PATHS = "\"AndroidTools/Preview Content\"";
DEVELOPMENT_TEAM = H9DTPYA8RY;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -751,7 +751,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.4.0;
MARKETING_VERSION = 1.4.1;
PRODUCT_BUNDLE_IDENTIFIER = fr.thomasbernard03.AndroidTools;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -769,7 +769,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_ASSET_PATHS = "\"AndroidTools/Preview Content\"";
DEVELOPMENT_TEAM = H9DTPYA8RY;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -783,7 +783,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 1.4.0;
MARKETING_VERSION = 1.4.1;
PRODUCT_BUNDLE_IDENTIFIER = fr.thomasbernard03.AndroidTools;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down
10 changes: 10 additions & 0 deletions AndroidTools/AndroidTools/Presentation/Home/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@ struct HomeView: View {
Text("To reduce the size of the application, we decided not to include ADB in the application (to avoid double installation on the Mac). It is therefore up to the user to install ADB. ")
.font(.subheadline)

HStack {
Text("Resolving errors")
.font(.title2)

Spacer()
}

Text("If your application displays strange results or does not work properly, check the adb path configured in the settings. You must provide a valid path. To find out where adb is installed on your Mac, open a terminal and enter the command: which adb")
.font(.subheadline)



}
Expand Down
20 changes: 14 additions & 6 deletions AndroidTools/AndroidTools/Presentation/Logcat/LogcatView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ struct LogcatView: View {
ZStack(alignment:.bottom) {
VStack {
ScrollViewReader { proxy in

List(viewModel.logEntries){
LogEntryItem(date: $0.datetime, processId: $0.processID, threadId: $0.threadID, tag: $0.tag, level: $0.level, message: $0.message)
.listRowSeparator(.hidden)
Expand Down Expand Up @@ -99,12 +100,19 @@ struct LogcatView: View {
.searchable(text: $packageName, prompt: "Package name")
.searchSuggestions {
ForEach(packagesSearch, id: \.self){ package in
Text(package)
.searchCompletion(package)
.onTapGesture {
packageName = package
viewModel.getLogcat(deviceId: deviceId, packageName: package)
}
HStack {
Text(package)

.padding(.vertical, 4)

Spacer()
}
.searchCompletion(package)
.contentShape(Rectangle())
.onTapGesture {
packageName = package
viewModel.getLogcat(deviceId: deviceId, packageName: package)
}
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions appcast.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<channel>
<title>AndroidTools</title>
<item>
<title>1.4.0</title>
<pubDate>Thu, 23 May 2024 21:48:37 +0200</pubDate>
<sparkle:version>6</sparkle:version>
<sparkle:shortVersionString>1.4.0</sparkle:shortVersionString>
<title>1.4.1</title>
<pubDate>Sun, 26 May 2024 15:53:01 +0200</pubDate>
<sparkle:version>7</sparkle:version>
<sparkle:shortVersionString>1.4.1</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>14.0</sparkle:minimumSystemVersion>
<enclosure url="https://github.com/ThomasBernard03/AndroidTools/releases/download/1.4.0/AndroidTools.dmg" length="2453374" type="application/octet-stream" sparkle:edSignature="E/Ab7L2Z1x3UOupEB5R4O2/qn20onI8WVsaJO9XSyvjSpWyejQ+HxArVXQhSslTbu5Dp9APb4a61TNIi4DlmAw=="/>
<enclosure url="https://github.com/ThomasBernard03/AndroidTools/releases/download/1.4.1/AndroidTools.dmg" length="2455118" type="application/octet-stream" sparkle:edSignature="PynSgaIixFHoVuotiZrWtFpQ3eIh0lb2zmvHyjhbrZ+FLxyydbzTCJ6ItyS+QuU+Ekms7El7EJOhzyAv8UjiAA=="/>
</item>
</channel>
</rss>