From 94bb44aabe2b70ca8ff3916cb73c8b9c390843a4 Mon Sep 17 00:00:00 2001 From: SVolf Date: Sat, 24 Aug 2019 21:42:39 +0700 Subject: [PATCH 1/7] Update build tools version --- app/build.gradle | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7924f25..c297e09 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,7 +17,7 @@ repositories { android { compileSdkVersion 29 - buildToolsVersion '29.0.0' + buildToolsVersion '29.0.2' defaultConfig { applicationId "com.pluscubed.matlog" diff --git a/build.gradle b/build.gradle index a56e3b3..b9e4337 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.0' classpath 'com.google.gms:google-services:4.2.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c4486d4..7fd7272 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sat Aug 24 20:27:25 KRAT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From fe467c578d6f0bf4589d22b13959dbd7560d5858 Mon Sep 17 00:00:00 2001 From: SVolf Date: Sun, 25 Aug 2019 20:08:26 +0700 Subject: [PATCH 2/7] Fixed some log lines parsing e.g: I/NetworkController.MobileSignalController(2)( 2652): --- app/src/main/java/com/pluscubed/logcat/data/LogLine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/pluscubed/logcat/data/LogLine.java b/app/src/main/java/com/pluscubed/logcat/data/LogLine.java index bcd7df9..e67e7e0 100644 --- a/app/src/main/java/com/pluscubed/logcat/data/LogLine.java +++ b/app/src/main/java/com/pluscubed/logcat/data/LogLine.java @@ -20,7 +20,7 @@ public class LogLine { "(\\w)" + "/" + // tag - "([^(]+)" + + "([^(].+)" + "\\(\\s*" + // pid "(\\d+)" + @@ -49,7 +49,7 @@ public static LogLine newLogLine(String originalLine, boolean expanded, String f // if the first char is a digit, then this starts out with a timestamp // otherwise, it's a legacy log or the beginning of the log output or something - if (!TextUtils.isEmpty(originalLine) + if (!TextUtils.isEmpty(originalLine) && Character.isDigit(originalLine.charAt(0)) && originalLine.length() >= TIMESTAMP_LENGTH) { String timestamp = originalLine.substring(0, TIMESTAMP_LENGTH - 1); From ca3dfae5daf081b184a5a7125d9490dd080daedf Mon Sep 17 00:00:00 2001 From: SVolf Date: Sun, 25 Aug 2019 20:19:43 +0700 Subject: [PATCH 3/7] Updated russian strings --- app/src/main/res/values-ru/strings.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c92f732..61faf07 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,13 +1,11 @@ - - О программе О программе MatLog Добавить фильтр - Добавить фильр… + Добавить фильтр… %d file will be deleted @@ -48,7 +46,7 @@ %d файлов будет удалёно - Поиск по... + Поиск по… PID Тег Фильтр текста: @@ -127,7 +125,7 @@ Настройки -  (Simultaneous) +  (Одновременный) Запись @@ -183,8 +181,8 @@ Эта функция не будет работать без разрешения на запись во внутр. накопитель Поиск - Omit sensitive info - Omit sensitive info like web urls, phone numbers or emails + Скрыть личные данные + Исключать из лога конфиденциальную информацию (URL, IP адреса, Email) Добавить лог ядра Сохранить в ZIP Поделиться From 335945cef84308669761025e63c7b26cad3759f6 Mon Sep 17 00:00:00 2001 From: SVolf Date: Sun, 25 Aug 2019 21:47:29 +0700 Subject: [PATCH 4/7] Bump version --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c297e09..2c40548 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId "com.pluscubed.matlog" minSdkVersion 16 targetSdkVersion 29 - versionName '1.2.3' - versionCode 11 + versionName '1.3.0' + versionCode 12 testApplicationId "com.pluscubed.matlog.test" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From 7ea6de13ae45f2d4cf6cbe3e37ddf51e4fb5ac5a Mon Sep 17 00:00:00 2001 From: SVolf Date: Sat, 21 Sep 2019 10:09:29 +0700 Subject: [PATCH 5/7] Update ic_more_vert_24dp.xml --- app/src/main/res/drawable/ic_more_vert_24dp.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/drawable/ic_more_vert_24dp.xml b/app/src/main/res/drawable/ic_more_vert_24dp.xml index 8401da1..9d2027b 100644 --- a/app/src/main/res/drawable/ic_more_vert_24dp.xml +++ b/app/src/main/res/drawable/ic_more_vert_24dp.xml @@ -1,5 +1,5 @@ - + From 4857ea1f6f080bf62a4bf43576514d92b9a791c5 Mon Sep 17 00:00:00 2001 From: SVolf Date: Tue, 24 Sep 2019 21:05:47 +0700 Subject: [PATCH 6/7] Fixed white on white glitches --- app/src/main/res/layout/list_item_logfilename_single.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/layout/list_item_logfilename_single.xml b/app/src/main/res/layout/list_item_logfilename_single.xml index 35a88ea..35d15a7 100644 --- a/app/src/main/res/layout/list_item_logfilename_single.xml +++ b/app/src/main/res/layout/list_item_logfilename_single.xml @@ -28,7 +28,6 @@ android:layout_marginTop="16dp" android:ellipsize="marquee" android:gravity="center_vertical" - android:textColor="@color/primary_text_default_material_dark" android:textSize="16sp" tools:text="TEST" android:singleLine="true" /> From 96c3ec4674294db1528b42d7899c3475c1e7748e Mon Sep 17 00:00:00 2001 From: Loboazteca88 <117570826+Loboazteca88@users.noreply.github.com> Date: Sun, 23 Feb 2025 14:57:36 -0600 Subject: [PATCH 7/7] Create android.yml --- .github/workflows/android.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/android.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 0000000..91a69d1 --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,26 @@ +name: Android CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'temurin' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build