diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index efd2b3f..268f715 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,4 +41,3 @@ jobs: path: | ${{github.workspace}}/build/*.pkg ${{github.workspace}}/build/*.app - diff --git a/AndroidTools/AndroidTools.xcodeproj/project.pbxproj b/AndroidTools/AndroidTools.xcodeproj/project.pbxproj index 6d0f2de..8c3a1f6 100644 --- a/AndroidTools/AndroidTools.xcodeproj/project.pbxproj +++ b/AndroidTools/AndroidTools.xcodeproj/project.pbxproj @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/AndroidTools/AndroidTools/Presentation/Home/HomeView.swift b/AndroidTools/AndroidTools/Presentation/Home/HomeView.swift index 4f69320..f4e9fd0 100644 --- a/AndroidTools/AndroidTools/Presentation/Home/HomeView.swift +++ b/AndroidTools/AndroidTools/Presentation/Home/HomeView.swift @@ -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) + } diff --git a/AndroidTools/AndroidTools/Presentation/Logcat/LogcatView.swift b/AndroidTools/AndroidTools/Presentation/Logcat/LogcatView.swift index ec620f4..a9853c0 100644 --- a/AndroidTools/AndroidTools/Presentation/Logcat/LogcatView.swift +++ b/AndroidTools/AndroidTools/Presentation/Logcat/LogcatView.swift @@ -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) @@ -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) + } } } } diff --git a/appcast.xml b/appcast.xml index 55badd7..4a7c069 100644 --- a/appcast.xml +++ b/appcast.xml @@ -3,12 +3,12 @@ AndroidTools - 1.4.0 - Thu, 23 May 2024 21:48:37 +0200 - 6 - 1.4.0 + 1.4.1 + Sun, 26 May 2024 15:53:01 +0200 + 7 + 1.4.1 14.0 - + \ No newline at end of file