diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index b268ef3..e38da12 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,6 +4,14 @@ diff --git a/app/build.gradle b/app/build.gradle index ed80e36..3773198 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,9 +53,8 @@ android { } dependencies { - // 第三方库依赖管理(建议通过 libs 别名集中声明,位于 build.gradle.kts 或 settings.gradle) + // HTTP 客户端库(注意:Android 6.0+ 需动态申请网络权限) - // HTTP 客户端库(Apache HttpClient 4.5.14,注意:Android 6.0+ 需动态申请网络权限) implementation("org.apache.httpcomponents:httpclient:4.5.14") // AndroidX 支持库 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index beb3c10..bb09d7d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -44,7 +44,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.Notesmaster" + android:theme="@style/Theme.AppCompat.Light.DarkActionBar" tools:targetApi="31"> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55df868..6a316b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -120,6 +120,9 @@ Call notes Input name + Background: beijing + Background: bb + Searching Notes Search notes Text in your notes diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d750e65..448262c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -49,7 +49,7 @@ @@ -66,4 +66,7 @@ gone - \ No newline at end of file + + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 3720822..04a33b3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,35 +1,59 @@ +// Gradle 插件管理配置 pluginManagement { + // 定义插件解析时的仓库搜索顺序 repositories { + // 阿里云 Maven 镜像 - 中央仓库 maven { setUrl("https://maven.aliyun.com/repository/central") } + // 阿里云 Maven 镜像 - JCenter (已停止更新,仅用于兼容旧依赖) maven { setUrl("https://maven.aliyun.com/repository/jcenter") } + // 阿里云 Maven 镜像 - Google 官方仓库 maven { setUrl("https://maven.aliyun.com/repository/google") } + // 阿里云 Maven 镜像 - Gradle 插件仓库 maven { setUrl("https://maven.aliyun.com/repository/gradle-plugin") } + // 阿里云公共仓库 - 包含多个源的综合镜像 maven { setUrl("https://maven.aliyun.com/repository/public") } + // JitPack - 用于直接从 GitHub 引用依赖 maven { setUrl("https://jitpack.io") } + + // Google 官方仓库,限定只搜索 Android 相关组件 google { content { - includeGroupByRegex("com\\.android.*") - includeGroupByRegex("com\\.google.*") - includeGroupByRegex("androidx.*") + includeGroupByRegex("com\\.android.*") // Android SDK 组件 + includeGroupByRegex("com\\.google.*") // Google 库和服务 + includeGroupByRegex("androidx.*") // AndroidX 组件 } } + + // Maven 中央仓库 mavenCentral() + // Gradle 插件门户 gradlePluginPortal() } } + +// 依赖解析管理配置 dependencyResolutionManagement { + // 配置依赖解析模式:当项目中定义了仓库时会报错,强制统一使用 settings.gradle 中的仓库 repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + + // 定义项目依赖解析时的仓库搜索顺序 repositories { + // 阿里云镜像仓库配置 (同 pluginManagement) maven { setUrl("https://maven.aliyun.com/repository/central") } maven { setUrl("https://maven.aliyun.com/repository/jcenter") } maven { setUrl("https://maven.aliyun.com/repository/google") } maven { setUrl("https://maven.aliyun.com/repository/gradle-plugin") } maven { setUrl("https://maven.aliyun.com/repository/public") } maven { setUrl("https://jitpack.io") } + + // Google 官方仓库 (完整搜索范围) google() + // Maven 中央仓库 mavenCentral() } } +// 根项目名称 rootProject.name = "Notes-master" -include ':app' +// 包含的子项目 +include ':app' \ No newline at end of file