Skip to content

Commit

Permalink
适配androidx,更新apg
Browse files Browse the repository at this point in the history
  • Loading branch information
zhaolewei committed Dec 24, 2023
1 parent 9c0413b commit 215d4c4
Show file tree
Hide file tree
Showing 23 changed files with 231 additions and 300 deletions.
3 changes: 2 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 15 additions & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions .idea/modules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

67 changes: 46 additions & 21 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,37 +1,62 @@
apply plugin: 'com.android.application'
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

android {
compileSdkVersion 28
namespace 'com.zlw.audio_recorder'
compileSdk 33

defaultConfig {
applicationId "com.main.zlw.zlwaudiorecorder"
minSdkVersion 19
targetSdkVersion 28
applicationId "com.zlw.audio_recorder"
minSdk 24
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary true
}
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.4.3'
}
packaging {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
}
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
androidTestImplementation('com.android.support:support-annotations:28.0.0') {
force = true
}
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.activity:activity-compose:1.7.2'
implementation platform('androidx.compose:compose-bom:2023.03.00')
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.ui:ui-graphics'
implementation 'androidx.compose.ui:ui-tooling-preview'
implementation 'androidx.compose.material3:material3'

implementation 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
implementation 'com.blankj:utilcode:1.18.0'
implementation 'com.yanzhenjie.permission:support:2.0.1'
implementation 'com.blankj:utilcodex:1.31.1'
implementation 'com.yanzhenjie:permission:2.0.3'
implementation 'com.github.zhaolewei:Logger:1.0.2'
implementation project(path: ':recorderlib')
implementation 'com.github.zhaolewei:Logger:1.0.1'
}
}
15 changes: 8 additions & 7 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.main.zlw.zlwaudiorecorder">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
Expand All @@ -14,21 +14,22 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">

<activity android:name=".MainActivity">
android:theme="@style/Theme.ZlwAudioRecorder"
tools:targetApi="31">
<activity
android:name=".MainActivity"
android:exported="true"
android:theme="@style/Theme.ZlwAudioRecorder">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".TestHzActivity"
android:label="test"
android:screenOrientation="landscape"
android:theme="@style/Theme.AppCompat.DayNight.NoActionBar" />
android:screenOrientation="landscape" />

<service
android:name="com.zlw.main.recorderlib.recorder.RecordService"
Expand Down
37 changes: 0 additions & 37 deletions app/src/main/java/com/main/zlw/zlwaudiorecorder/base/MyApp.java

This file was deleted.

Loading

0 comments on commit 215d4c4

Please sign in to comment.