Skip to content

Commit deabb59

Browse files
Yorick-RyuYorick-Ryu
committed
Merge branch 'dev' into release
# Conflicts: # app/src/main/java/com/yorick/cokotools/MainActivity.kt
2 parents 904d736 + 688514d commit deabb59

29 files changed

Lines changed: 185 additions & 208 deletions

‎app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ plugins {
55

66
android {
77
namespace 'com.yorick.cokotools'
8-
compileSdk 32
8+
compileSdk 33
99

1010
defaultConfig {
1111
applicationId "com.yorick.cokotools"
1212
minSdk 24
13-
targetSdk 32
13+
targetSdk 33
1414
versionCode 1
15-
versionName "1.0"
15+
versionName "2.0"
1616

1717
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1818
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<activity
1616
android:name=".DonateActivity"
1717
android:exported="false">
18-
<meta-data
19-
android:name="android.app.lib_name"
20-
android:value="" />
2118
</activity>
2219
<activity
2320
android:name=".MainActivity"
@@ -29,10 +26,6 @@
2926

3027
<category android:name="android.intent.category.LAUNCHER" />
3128
</intent-filter>
32-
33-
<meta-data
34-
android:name="android.app.lib_name"
35-
android:value="" />
3629
</activity>
3730
</application>
3831

‎app/src/main/java/com/yorick/cokotools/MainActivity.kt‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,52 @@
11
package com.yorick.cokotools
22

33
import android.content.Intent
4+
import android.content.SharedPreferences
45
import android.net.Uri
56
import android.os.Bundle
67
import android.view.Menu
78
import android.view.MenuItem
89
import androidx.appcompat.app.AppCompatActivity
910
import androidx.core.view.WindowCompat
1011
import androidx.navigation.ui.AppBarConfiguration
12+
import com.google.android.material.dialog.MaterialAlertDialogBuilder
1113
import com.yorick.cokotools.databinding.ActivityMainBinding
1214
import com.yorick.cokotools.util.Utils
1315
import com.yorick.cokotools.util.Utils.toastUtil
1416

1517
class MainActivity : AppCompatActivity() {
1618

17-
private lateinit var appBarConfiguration: AppBarConfiguration
1819
private lateinit var binding: ActivityMainBinding
20+
private lateinit var preferences: SharedPreferences
1921

2022
override fun onCreate(savedInstanceState: Bundle?) {
23+
24+
preferences = getSharedPreferences("count", MODE_PRIVATE)
25+
var count: Int = preferences.getInt("count", 0)
26+
//判断程序与第几次运行，如果是第一次运行则开启弹窗
27+
val editor: SharedPreferences.Editor
28+
if (count == 0) {
29+
editor = preferences.edit()
30+
val uri: Uri = Uri.parse(resources.getString(R.string.help_doc))
31+
MaterialAlertDialogBuilder(this)
32+
.setIcon(R.drawable.ic_logo)
33+
.setTitle(resources.getString(R.string.exceptions_title))
34+
.setMessage(resources.getString(R.string.exceptions_message))
35+
.setNeutralButton(resources.getString(R.string.exceptions_read_help_doc)) { _, _ ->
36+
this.startActivity(Intent(Intent.ACTION_VIEW, uri))
37+
}
38+
.setNegativeButton(resources.getString(R.string.decline)) { _, _ ->
39+
editor.putInt("count", 0)
40+
editor.commit()
41+
finish()
42+
}
43+
.setPositiveButton(resources.getString(R.string.exceptions_accept)) { _, _ ->
44+
editor.putInt("count", ++count)
45+
editor.commit()
46+
}.setCancelable(false)
47+
.show()
48+
}
49+
2150
WindowCompat.setDecorFitsSystemWindows(window, false)
2251
super.onCreate(savedInstanceState)
2352

@@ -27,6 +56,7 @@ class MainActivity : AppCompatActivity() {
2756
setSupportActionBar(binding.toolbar)
2857

2958
binding.buttonLockBands.setOnClickListener {
59+
// 尝试打开
3060
Utils.jumpActivity(
3161
this,
3262
resources.getString(R.string.lock_bands_package),
@@ -100,6 +130,7 @@ class MainActivity : AppCompatActivity() {
100130
}
101131

102132
override fun onOptionsItemSelected(item: MenuItem): Boolean {
133+
103134
return when (item.itemId) {
104135
R.id.action_donate -> {
105136
startActivity(Intent(this, DonateActivity::class.java))

‎app/src/main/java/com/yorick/cokotools/util/Utils.kt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.yorick.cokotools.R
1414

1515
object Utils {
1616

17+
1718
private fun openActivity(context: Context, packageName: String, activityName: String): Boolean {
1819
try {
1920
val intent = Intent()
@@ -80,14 +81,15 @@ object Utils {
8081
val resources = context.resources
8182
if (!flag) {
8283
MaterialAlertDialogBuilder(context)
84+
.setIcon(R.drawable.ic_logo)
8385
.setTitle(resources.getString(R.string.compose_needed))
8486
.setMessage(msg)
85-
.setNeutralButton(resources.getString(R.string.cancel)) { dialog, which ->
87+
.setNeutralButton(resources.getString(R.string.cancel)) { _, _ ->
8688

8789
}
88-
.setNegativeButton(resources.getString(R.string.decline)) { dialog, which ->
90+
.setNegativeButton(resources.getString(R.string.decline)) { _, _ ->
8991
}
90-
.setPositiveButton(resources.getString(R.string.accept)) { dialog, which ->
92+
.setPositiveButton(resources.getString(R.string.accept)) { _, _ ->
9193
val uri: Uri = Uri.parse(resources.getString(R.string.help_doc))
9294
context.startActivity(Intent(Intent.ACTION_VIEW, uri))
9395
}

‎app/src/main/res/drawable-v24/ic_launcher_foreground.xml‎

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,40 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:aapt="http://schemas.android.com/aapt"
32
android:width="108dp"
43
android:height="108dp"
5-
android:viewportWidth="108"
6-
android:viewportHeight="108">
7-
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
8-
<aapt:attr name="android:fillColor">
9-
<gradient
10-
android:endX="85.84757"
11-
android:endY="92.4963"
12-
android:startX="42.9492"
13-
android:startY="49.59793"
14-
android:type="linear">
15-
<item
16-
android:color="#44000000"
17-
android:offset="0.0" />
18-
<item
19-
android:color="#00000000"
20-
android:offset="1.0" />
21-
</gradient>
22-
</aapt:attr>
23-
</path>
4+
android:tint="@color/color_ic_fore"
5+
android:viewportWidth="216"
6+
android:viewportHeight="216">
247
<path
25-
android:fillColor="#FFFFFF"
26-
android:fillType="nonZero"
27-
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
28-
android:strokeWidth="1"
29-
android:strokeColor="#00000000" />
30-
</vector>
8+
android:fillAlpha="0.9"
9+
android:fillColor="#FF000000"
10+
android:pathData="
11+
M97,66
12+
Q79,66 71.5,84
13+
Q64,102 82,102
14+
L113,102
15+
Q137,102 144.5,84
16+
Q154,66 134,66" />
17+
18+
<path
19+
android:fillAlpha="0.72"
20+
android:fillColor="#FF000000"
21+
android:pathData="
22+
M97,90
23+
Q79,90 71.5,108
24+
Q64,126 82,126
25+
L113,126
26+
Q137,126 144.5,108
27+
Q154,90 134,90" />
28+
29+
<path
30+
android:fillAlpha="0.56"
31+
android:fillColor="#FF000000"
32+
android:pathData="
33+
M97,114
34+
Q79,114 71.5,132
35+
Q64,150 82,150
36+
L113,150
37+
Q137,150 144.5,132
38+
Q154,114 134,114" />
39+
40+
</vector>

‎app/src/main/res/drawable/donate_code.png‎

-173 KB
Binary file not shown.

‎app/src/main/res/drawable/donate_code.webp‎

52.5 KB
Loading

‎app/src/main/res/drawable/ic_coko.xml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="54dp"
3+
android:height="54dp"
4+
android:viewportWidth="108"
5+
android:viewportHeight="108">
6+
<path
7+
android:fillColor="#EADDFF"
8+
android:pathData="
9+
M0,0
10+
L108,108
11+
H0
12+
V0
13+
H108
14+
V108
15+
" />
16+
<path
17+
android:fillColor="#4F378B"
18+
android:fillAlpha="0.9"
19+
android:pathData="
20+
M43,12
21+
Q25,12 17.5,30
22+
Q10,48 28,48
23+
L65,48
24+
Q83,48 90.5,30
25+
Q98,12 80,12" />
26+
27+
<path
28+
android:fillColor="#4F378B"
29+
android:fillAlpha="0.72"
30+
android:pathData="
31+
M43,36
32+
Q25,36 17.5,54
33+
Q10,72 28,72
34+
L65,72
35+
Q83,72 90.5,54
36+
Q98,36 80,36" />
37+
38+
<path
39+
android:fillColor="#4F378B"
40+
android:fillAlpha="0.56"
41+
android:pathData="
42+
M43,60
43+
Q25,60 17.5,78
44+
Q10,96 28,96
45+
L65,96
46+
Q83,96 90.5,78
47+
Q98,60 80,60" />
48+
49+
</vector>

0 commit comments

Comments
 (0)