Skip to content

Commit e1134e4

Browse files
authored
Merge pull request #7 from k4biri/develop
Prepare Release 0.6.0
2 parents b77ae58 + 535f917 commit e1134e4

File tree

7 files changed

+38
-9
lines changed

7 files changed

+38
-9
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ lint/generated/
8181
lint/outputs/
8282
lint/tmp/
8383
# lint/reports/
84+
app/src/main/res/values/api_keys.xml

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55

66
This is being done as a hobby, and for experimenting, so probably there might be some flaws; As an example, the vendor ID of Arduino is hardcoded to only work with Arduino devices, but this is my use case and please feel free to change it to match your needs.
77

8+
# Build and Run
9+
The app is available for free on Google Play Store (Arduino USB Terminal).
10+
Otherwise, you can clone the project and run it locally.
11+
Please read the **Sentry Reports** part on this page before running the project to avoid build failures.
12+
813
## Terminal
914
A Simple terminal page which does what it is supposed to do interacting with an Arduino manually through the USB cable.
1015

@@ -14,9 +19,20 @@
1419
## Tests
1520
Under Construction
1621

22+
## Sentry Reports
23+
The project uses Sentry for the crash reports, if this is not needed, you can remove the following line in `AndroidManifest.xml`:
24+
`<meta-data android:name="io.sentry.dsn" android:value="@string/sentry_dsn" />`
25+
But if it is needed, you need to [create a Sentry dsn value](https://docs.sentry.io/platforms/android/) to put under the following path:
26+
`app/src/main/res/values/api_keys.xml`
27+
The file contents might look like similar to this:
28+
`<?xml version="1.0" encoding="utf-8"?>
29+
<resources>
30+
<string name="sentry_dsn" translatable="false">YOUR_SENTRY_SPECIFIC_VALUE</string>
31+
</resources>`
32+
33+
1734
### Knows Issues
18-
_On Android 5.1.1, the Arduino serial output cannot be shown. (It is said that an Android internal bug is the issue!)_ This was hopefully solved using LiveData
19-
The Arduino output characters might be shown a bit weird in the app while skipping some characters when the message is too long. This will be fixed as I figure out the reason! Any suggestions will be appreciated. :)
35+
_Still unknown! :)
2036

2137
Suggestions and PRs are welcome! :)
2238

app/build.gradle

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44
apply plugin: 'koin'
55

6+
repositories {
7+
jcenter()
8+
}
9+
610
android {
711
compileSdkVersion 29
8-
buildToolsVersion "29.0.2"
12+
buildToolsVersion "29.0.3"
913

1014
compileOptions {
1115
sourceCompatibility JavaVersion.VERSION_1_8
@@ -16,8 +20,8 @@ android {
1620
applicationId "org.kabiri.android.usbterminal"
1721
minSdkVersion 23
1822
targetSdkVersion 29
19-
versionCode 5
20-
versionName "0.5.0"
23+
versionCode 6
24+
versionName "0.6.0"
2125

2226
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2327
}
@@ -39,6 +43,9 @@ dependencies {
3943
implementation 'androidx.core:core-ktx:1.2.0'
4044
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
4145

46+
// Sentry Tracking
47+
implementation 'io.sentry:sentry-android-core:2.0.2'
48+
4249
// Koin for Android - ViewModel features
4350
implementation "org.koin:koin-android-viewmodel:$koin_version"
4451

app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
package="org.kabiri.android.usbterminal">
44

55
<uses-feature android:name="android.hardware.usb.host" />
6+
<uses-permission android:name="android.permission.INTERNET" />
7+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
68

79
<application
810
android:name=".MainApplication"
@@ -13,6 +15,9 @@
1315
android:roundIcon="@mipmap/ic_launcher_round"
1416
android:supportsRtl="true"
1517
android:theme="@style/AppTheme">
18+
19+
<meta-data android:name="io.sentry.dsn" android:value="@string/sentry_dsn" />
20+
1621
<activity android:name=".MainActivity">
1722
<intent-filter>
1823
<action android:name="android.intent.action.MAIN" />

app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.kabiri.android.usbterminal
22

3-
import android.content.Intent
43
import android.os.Bundle
54
import android.text.SpannableString
65
import android.text.method.ScrollingMovementMethod
@@ -10,10 +9,12 @@ import android.view.MenuInflater
109
import android.view.MenuItem
1110
import androidx.appcompat.app.AppCompatActivity
1211
import androidx.lifecycle.Observer
12+
import io.sentry.core.Sentry
1313
import kotlinx.android.synthetic.main.activity_main.*
1414
import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
1515
import org.koin.android.viewmodel.ext.android.viewModel
1616

17+
1718
class MainActivity : AppCompatActivity() {
1819

1920
companion object {

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.71'
4+
ext.kotlin_version = '1.3.72'
55
ext.koin_version = '2.1.5'
66
repositories {
77
google()
88
jcenter()
9-
109
}
1110
dependencies {
1211
classpath 'com.android.tools.build:gradle:3.6.3'

0 commit comments

Comments
 (0)