Skip to content

Commit

Permalink
1.fix many bugs 2.change UI 3.no
Browse files Browse the repository at this point in the history
  • Loading branch information
LCiZY committed Dec 1, 2020
1 parent be896ac commit 21c1c75
Show file tree
Hide file tree
Showing 153 changed files with 6,107 additions and 427 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ShareOnLan.pro.user
*/*/.idea
Binary file added Android/release/app-debug.apk
Binary file not shown.
Binary file modified Android/release/app-release.apk
Binary file not shown.
1 change: 1 addition & 0 deletions Android/source-code/app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
proguard-rules.pro
7 changes: 4 additions & 3 deletions Android/source-code/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ android {
compileSdkVersion 29
buildToolsVersion "29.0.2"
defaultConfig {
applicationId "com.sil"
minSdkVersion 22
applicationId "com.sol"
minSdkVersion 23
targetSdkVersion 29
versionCode 2
versionName "2.0"
versionName "2.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -26,4 +26,5 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'

}
Binary file added Android/source-code/app/debug/app-debug.apk
Binary file not shown.
18 changes: 18 additions & 0 deletions Android/source-code/app/debug/output-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 2,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.sol",
"variantName": "processDebugResources",
"elements": [
{
"type": "SINGLE",
"filters": [],
"versionCode": 2,
"versionName": "2.2",
"outputFile": "app-debug.apk"
}
]
}
Binary file modified Android/source-code/app/release/app-release.apk
Binary file not shown.
18 changes: 18 additions & 0 deletions Android/source-code/app/release/output-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 2,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.sol",
"variantName": "processReleaseResources",
"elements": [
{
"type": "SINGLE",
"filters": [],
"versionCode": 2,
"versionName": "2.2",
"outputFile": "app-release.apk"
}
]
}
2 changes: 1 addition & 1 deletion Android/source-code/app/release/output.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"2.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.sil;
package com.sol;

import android.content.Context;

Expand All @@ -22,6 +22,6 @@ public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();

assertEquals("com.sil", appContext.getPackageName());
assertEquals("com.sol", appContext.getPackageName());
}
}
6 changes: 3 additions & 3 deletions Android/source-code/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.sil">
package="com.sol">

<application
android:allowBackup="true"
Expand All @@ -12,7 +12,7 @@
android:theme="@style/AppTheme"
android:requestLegacyExternalStorage="true"
>
<activity android:name=".MainActivity" android:launchMode="singleInstance">
<activity android:name="com.sol.MainActivity" android:launchMode="singleInstance">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down Expand Up @@ -76,7 +76,7 @@

<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.sil.fileprovider"
android:authorities="com.sol.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
Expand Down
91 changes: 0 additions & 91 deletions Android/source-code/app/src/main/java/com/sil/util/FileUtils.java

This file was deleted.

Loading

0 comments on commit 21c1c75

Please sign in to comment.