Skip to content

Commit f4ddd29

Browse files
ArcticFoxProArcticFoxPro
authored
牛子你好香 (klxiaoniu#3)
* 回滚回滚的代码 * 更换图标 * 修复分享字符串小版本号错误的问题 * 格式化代码 * fix一处逻辑问题 * 更改桌面图标、下沉标题栏
1 parent 75b6070 commit f4ddd29

Some content is hidden

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

68 files changed

+1652
-1191
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@
1313
.externalNativeBuild
1414
.cxx
1515
local.properties
16+
/app/release
17+
.idea/misc.xml
18+
.idea/.name
19+
/.idea

‎.idea/.name

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/deploymentTargetDropDown.xml

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/kotlinc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle.kts

+104-53
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,105 @@
1-
plugins {
2-
id("com.android.application")
3-
id("org.jetbrains.kotlin.android")
4-
}
5-
6-
android {
7-
namespace = "com.xiaoniu.qqversionlist"
8-
compileSdk = 34
9-
10-
defaultConfig {
11-
applicationId = "com.xiaoniu.qqversionlist"
12-
minSdk = 24
13-
targetSdk = 34
14-
versionCode = 2
15-
versionName = "1.1"
16-
17-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
18-
}
19-
20-
buildTypes {
21-
release {
22-
isMinifyEnabled = true
23-
proguardFiles(
24-
getDefaultProguardFile("proguard-android-optimize.txt"),
25-
"proguard-rules.pro"
26-
)
27-
signingConfig = signingConfigs.getByName("debug")
28-
}
29-
}
30-
compileOptions {
31-
sourceCompatibility = JavaVersion.VERSION_1_8
32-
targetCompatibility = JavaVersion.VERSION_1_8
33-
}
34-
kotlinOptions {
35-
jvmTarget = "1.8"
36-
}
37-
buildFeatures {
38-
viewBinding = true
39-
}
40-
}
41-
42-
dependencies {
43-
44-
implementation("androidx.core:core-ktx:1.12.0")
45-
implementation("androidx.appcompat:appcompat:1.6.1")
46-
implementation("com.google.android.material:material:1.11.0")
47-
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
48-
testImplementation("junit:junit:4.13.2")
49-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
50-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
51-
52-
implementation("com.squareup.okhttp3:okhttp:4.12.0")
53-
implementation("com.google.code.gson:gson:2.10.1")
1+
plugins {
2+
id("com.android.application")
3+
id("org.jetbrains.kotlin.android")
4+
}
5+
6+
android {
7+
namespace = "com.xiaoniu.qqversionlist"
8+
compileSdk = 34
9+
10+
// buildFeatures {
11+
// compose = true
12+
// }
13+
//
14+
// composeOptions {
15+
// kotlinCompilerExtensionVersion = "1.5.8"
16+
// }
17+
18+
19+
defaultConfig {
20+
applicationId = "com.xiaoniu.qqversionlist"
21+
minSdk = 24
22+
targetSdk = 34
23+
versionCode = 2
24+
versionName = "1.1"
25+
26+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
27+
}
28+
29+
buildTypes {
30+
release {
31+
isMinifyEnabled = true
32+
proguardFiles(
33+
getDefaultProguardFile("proguard-android-optimize.txt"),
34+
"proguard-rules.pro"
35+
)
36+
signingConfig = signingConfigs.getByName("debug")
37+
}
38+
}
39+
compileOptions {
40+
sourceCompatibility = JavaVersion.VERSION_1_8
41+
targetCompatibility = JavaVersion.VERSION_1_8
42+
}
43+
kotlinOptions {
44+
jvmTarget = "1.8"
45+
}
46+
buildFeatures {
47+
viewBinding = true
48+
}
49+
}
50+
51+
dependencies {
52+
53+
implementation("androidx.core:core-ktx:1.12.0")
54+
implementation("androidx.appcompat:appcompat:1.6.1")
55+
implementation("com.google.android.material:material:1.11.0")
56+
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
57+
testImplementation("junit:junit:4.13.2")
58+
androidTestImplementation("androidx.test.ext:junit:1.1.5")
59+
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
60+
61+
implementation("com.squareup.okhttp3:okhttp:4.12.0")
62+
implementation("com.google.code.gson:gson:2.10.1")
63+
64+
val composeBom = platform("androidx.compose:compose-bom:2023.10.01")
65+
implementation("androidx.compose:compose-bom:2024.01.00")
66+
androidTestImplementation("androidx.compose:compose-bom:2024.01.00")
67+
68+
// // Choose one of the following:
69+
// // Material Design 3
70+
// implementation("androidx.compose.material3:material3")
71+
// // or Material Design 2
72+
// implementation("androidx.compose.material:material")
73+
// // or skip Material Design and build directly on top of foundational components
74+
// implementation("androidx.compose.foundation:foundation")
75+
// // or only import the main APIs for the underlying toolkit systems,
76+
// // such as input and measurement/layout
77+
// implementation("androidx.compose.ui:ui")
78+
//
79+
// // Android Studio Preview support
80+
// implementation("androidx.compose.ui:ui-tooling-preview")
81+
// debugImplementation("androidx.compose.ui:ui-tooling")
82+
//
83+
// // UI Tests
84+
// androidTestImplementation("androidx.compose.ui:ui-test-junit4")
85+
// debugImplementation("androidx.compose.ui:ui-test-manifest")
86+
//
87+
// // Optional - Included automatically by material, only add when you need
88+
// // the icons but not the material library (e.g. when using Material3 or a
89+
// // custom design system based on Foundation)
90+
// implementation("androidx.compose.material:material-icons-core")
91+
// // Optional - Add full set of material icons
92+
// implementation("androidx.compose.material:material-icons-extended")
93+
// // Optional - Add window size utils
94+
// implementation("androidx.compose.material3:material3-window-size-class")
95+
//
96+
// // Optional - Integration with activities
97+
// implementation("androidx.activity:activity-compose:1.8.2")
98+
// // Optional - Integration with ViewModels
99+
// implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
100+
// // Optional - Integration with LiveData
101+
// implementation("androidx.compose.runtime:runtime-livedata")
102+
// // Optional - Integration with RxJava
103+
// implementation("androidx.compose.runtime:runtime-rxjava2")
104+
54105
}

‎app/proguard-rules.pro

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
# Add project specific ProGuard rules here.
2-
# You can control the set of applied configuration files using the
3-
# proguardFiles setting in build.gradle.
4-
#
5-
# For more details, see
6-
# http://developer.android.com/guide/developing/tools/proguard.html
7-
8-
# If your project uses WebView with JS, uncomment the following
9-
# and specify the fully qualified class name to the JavaScript interface
10-
# class:
11-
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12-
# public *;
13-
#}
14-
15-
# Uncomment this to preserve the line number information for
16-
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
18-
19-
# If you keep the line number information, uncomment this to
20-
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
22-
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile
22+
2323
-keep class com.xiaoniu.qqversionlist.*{*;}

‎app/src/androidTest/java/com/xiaoniu/qqversionlist/ExampleInstrumentedTest.kt

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
package com.xiaoniu.qqversionlist
2-
3-
import androidx.test.platform.app.InstrumentationRegistry
4-
import androidx.test.ext.junit.runners.AndroidJUnit4
5-
6-
import org.junit.Test
7-
import org.junit.runner.RunWith
8-
9-
import org.junit.Assert.*
10-
11-
/**
12-
* Instrumented test, which will execute on an Android device.
13-
*
14-
* See [testing documentation](http://d.android.com/tools/testing).
15-
*/
16-
@RunWith(AndroidJUnit4::class)
17-
class ExampleInstrumentedTest {
18-
@Test
19-
fun useAppContext() {
20-
// Context of the app under test.
21-
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22-
assertEquals("com.xiaoniu.qqversionlist", appContext.packageName)
23-
}
1+
package com.xiaoniu.qqversionlist
2+
3+
import androidx.test.platform.app.InstrumentationRegistry
4+
import androidx.test.ext.junit.runners.AndroidJUnit4
5+
6+
import org.junit.Test
7+
import org.junit.runner.RunWith
8+
9+
import org.junit.Assert.*
10+
11+
/**
12+
* Instrumented test, which will execute on an Android device.
13+
*
14+
* See [testing documentation](http://d.android.com/tools/testing).
15+
*/
16+
@RunWith(AndroidJUnit4::class)
17+
class ExampleInstrumentedTest {
18+
@Test
19+
fun useAppContext() {
20+
// Context of the app under test.
21+
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22+
assertEquals("com.xiaoniu.qqversionlist", appContext.packageName)
23+
}
2424
}

‎app/src/main/AndroidManifest.xml

+29-27
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools">
4-
5-
<uses-permission android:name="android.permission.INTERNET"/>
6-
7-
<application
8-
android:allowBackup="true"
9-
android:dataExtractionRules="@xml/data_extraction_rules"
10-
android:fullBackupContent="@xml/backup_rules"
11-
android:icon="@mipmap/ic_launcher"
12-
android:label="@string/app_name"
13-
android:roundIcon="@mipmap/ic_launcher_round"
14-
android:supportsRtl="true"
15-
android:theme="@style/Theme.QQVersionList"
16-
tools:targetApi="31">
17-
<activity
18-
android:name=".ui.MainActivity"
19-
android:exported="true">
20-
<intent-filter>
21-
<action android:name="android.intent.action.MAIN" />
22-
23-
<category android:name="android.intent.category.LAUNCHER" />
24-
</intent-filter>
25-
</activity>
26-
</application>
27-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
5+
<uses-permission android:name="android.permission.INTERNET"/>
6+
7+
<application
8+
android:allowBackup="true"
9+
android:dataExtractionRules="@xml/data_extraction_rules"
10+
android:fullBackupContent="@xml/backup_rules"
11+
android:icon="@mipmap/ic_launcher"
12+
android:label="@string/app_name"
13+
android:roundIcon="@mipmap/ic_launcher_round"
14+
android:supportsRtl="true"
15+
android:usesCleartextTraffic="true"
16+
android:name=".TipTimeApplication"
17+
android:theme="@style/Theme.QQVersionList"
18+
tools:targetApi="31">
19+
<activity
20+
android:name=".ui.MainActivity"
21+
android:exported="true">
22+
<intent-filter>
23+
<action android:name="android.intent.action.MAIN" />
24+
25+
<category android:name="android.intent.category.LAUNCHER" />
26+
</intent-filter>
27+
</activity>
28+
</application>
29+
2830
</manifest>

‎app/src/main/ic_launcher-playstore.png

15.5 KB
Loading

‎app/src/main/java/com/xiaoniu/qqversionlist/TipTimeApplication.kt

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.xiaoniu.qqversionlist
2+
3+
import android.app.Application
4+
import androidx.core.provider.FontRequest
5+
import androidx.appcompat.app.AppCompatActivity
6+
import com.google.android.material.color.DynamicColors
7+
8+
class TipTimeApplication : Application() {
9+
override fun onCreate() {
10+
super.onCreate()
11+
// Android 12+ 动态颜色
12+
DynamicColors.applyToActivitiesIfAvailable(this)
13+
}
14+
}

0 commit comments

Comments
 (0)