From 4d35371e4ab912d13c78246817ab3e797a260bd6 Mon Sep 17 00:00:00 2001 From: icewithcola Date: Thu, 25 Jul 2024 14:25:13 +0800 Subject: [PATCH] Page 7 Stage 2 --- app/build.gradle.kts | 8 +- app/src/main/AndroidManifest.xml | 5 +- .../uk/kagurach/android101/MainActivity.java | 10 ++ .../main/java/uk/kagurach/android101/Page7.kt | 168 ++++++++++++++++-- app/src/main/res/layout/activity_main.xml | 8 +- app/src/main/res/layout/activity_page4.xml | 10 +- app/src/main/res/layout/activity_page7.xml | 39 +++- app/src/main/res/values-zh-rCN/strings.xml | 4 + app/src/main/res/values/strings.xml | 4 + gradle/libs.versions.toml | 3 + 10 files changed, 231 insertions(+), 28 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d2901f3..afb6f64 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,10 +10,10 @@ android { defaultConfig { applicationId = "uk.kagurach.android101" - minSdk = 31 + minSdk = 28 targetSdk = 34 - versionCode = 160 - versionName = "1.6" + versionCode = 172 + versionName = "1.7.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -89,4 +89,6 @@ dependencies { implementation(libs.moshi) implementation(libs.okhttp3) + + implementation(libs.ffmpeg.min) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3a22231..19465e2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,10 @@ - + + + (R.id.P7SetAPI).setOnClickListener(FrameButtonHandler()) findViewById(R.id.P7CloseResultButton).setOnClickListener(FrameButtonHandler()) findViewById(R.id.P7CloseAPIButton).setOnClickListener(FrameButtonHandler()) + + findViewById