Skip to content

Commit d397ec2

Browse files
authored
Merge pull request #18 from cslrfid/release-2.0.0
Updates for Google Play privacy policy requirement on location
2 parents dc0486c + f9a29ee commit d397ec2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+6616
-2334
lines changed

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion 30
55
defaultConfig {
66
applicationId "com.csl.cs108ademoapp"
77
minSdkVersion 19
8-
targetSdkVersion 29
9-
versionCode 29
10-
versionName "1.24.0"
8+
targetSdkVersion 30
9+
versionCode 30
10+
versionName "2.0.0"
1111
}
1212
}
1313

app/release/app-release.zip

-2.38 MB
Binary file not shown.
Binary file not shown.
Binary file not shown.

app/release/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{
1111
"type": "SINGLE",
1212
"filters": [],
13-
"versionCode": 29,
14-
"versionName": "1.24.0",
13+
"versionCode": 30,
14+
"versionName": "2.0.0",
1515
"outputFile": "app-release.apk"
1616
}
1717
]

app/release/output.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
android:icon="@drawable/csl_logo"
1414
android:label="@string/app_name"
1515
android:supportsRtl="true"
16+
android:requestLegacyExternalStorage="true"
1617
android:theme="@style/AppTheme">
1718

18-
<service android:name=".CustomIME"
19+
<service android:name="com.csl.cs108ademoapp.CustomIME"
1920
android:label="@string/app_ime"
2021
android:permission="android.permission.BIND_INPUT_METHOD">
2122
<intent-filter>
@@ -25,7 +26,7 @@
2526
</service>
2627

2728
<activity
28-
android:name=".MainActivity"
29+
android:name="com.csl.cs108ademoapp.MainActivity"
2930
android:screenOrientation="portrait">
3031
<intent-filter>
3132
<action android:name="android.intent.action.MAIN" />

app/src/main/java/com/csl/cs108ademoapp/AccessTask1.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.os.AsyncTask;
44
import android.widget.Button;
5-
import android.widget.TextView;
65
import android.widget.Toast;
76

87
import com.csl.cs108library4a.Cs108Connector;

app/src/main/java/com/csl/cs108ademoapp/CustomMediaPlayer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import android.content.res.AssetFileDescriptor;
55
import android.media.AudioManager;
66
import android.media.MediaPlayer;
7-
import androidx.annotation.Keep;
8-
import androidx.annotation.NonNull;
97

108
import java.io.IOException;
119

app/src/main/java/com/csl/cs108ademoapp/CustomPopupWindow.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.widget.TextView;
1111

1212
import static android.content.Context.LAYOUT_INFLATER_SERVICE;
13+
import static com.csl.cs108ademoapp.MainActivity.mCs108Library4a;
1314

1415
public class CustomPopupWindow {
1516
Context context;
@@ -26,6 +27,7 @@ public void popupStart(String message, boolean wait) {
2627
TextView textViewDismiss = (TextView)popupView.findViewById(R.id.dismissMessage);
2728
int iLenghtMax = 300;
2829
if (message.length() > iLenghtMax) message = message.substring(0, iLenghtMax) + " .....";
30+
mCs108Library4a.appendToLog("SaveList2ExternalTask: popupStart message = " + message);
2931
textViewDismiss.setText(message);
3032
Button btnDismiss = (Button)popupView.findViewById(R.id.dismiss);
3133
if (wait) btnDismiss.setVisibility(View.GONE);

0 commit comments

Comments
 (0)