Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4af84a1

Browse files
author
YangDai
committed
Optimize unit conversion activity, Fully adapted to predictive back gestures, Add animation for HistoryListFragment
1 parent ad155b0 commit 4af84a1

File tree

103 files changed

+1860
-1838
lines changed

Some content is hidden

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

103 files changed

+1860
-1838
lines changed

‎app/build.gradle‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ android {
1313
applicationId "com.yangdai.calc"
1414
minSdk 28
1515
targetSdk 34
16-
versionCode 45
17-
versionName '5.5'
16+
versionCode 47
17+
versionName '5.7'
1818
resourceConfigurations += ["en", "zh", "de"]
1919
}
2020

@@ -48,17 +48,19 @@ android {
4848
}
4949

5050
dependencies {
51-
implementation 'androidx.window:window:1.1.0'
5251
implementation(platform('org.jetbrains.kotlin:kotlin-bom:1.9.20'))
5352
implementation 'com.tbuonomo:dotsindicator:5.0'
5453
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
54+
5555
implementation 'com.google.android.play:app-update:2.1.0'
5656
implementation 'com.google.android.gms:play-services-oss-licenses:17.0.1'
5757
implementation 'com.google.android.gms:play-services-location:21.0.1'
58-
implementation platform('com.google.firebase:firebase-bom:32.5.0')
58+
implementation platform('com.google.firebase:firebase-bom:32.6.0')
5959
implementation 'com.google.firebase:firebase-analytics'
6060
implementation 'com.google.firebase:firebase-crashlytics'
6161

62+
implementation 'androidx.activity:activity:1.8.1'
63+
implementation 'androidx.window:window:1.2.0'
6264
implementation 'androidx.appcompat:appcompat:1.6.1'
6365
implementation 'com.google.android.material:material:1.10.0'
6466
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

‎app/src/main/AndroidManifest.xml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<uses-permission android:name="android.permission.INTERNET" />
1010
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
1111
<uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
12+
<!--suppress DeprecatedClassUsageInspection -->
1213
<uses-permission android:name="android.permission.GET_TASKS" /> <!-- 适配android 11无法唤起第三方apk -->
1314
<uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
1415

@@ -42,22 +43,22 @@
4243
tools:targetApi="tiramisu">
4344

4445
<activity
45-
android:name=".fraction.FractionActivity"
46+
android:name=".main.toolbox.functions.fraction.FractionActivity"
4647
android:exported="true"
4748
android:label="@string/numberConvert"
4849
android:parentActivityName=".main.MainActivity" />
4950
<activity
50-
android:name=".algebra.StatisticsActivity"
51+
android:name=".main.toolbox.functions.algebra.StatisticsActivity"
5152
android:exported="true"
5253
android:label="@string/statisticActivity"
5354
android:parentActivityName=".main.MainActivity" />
5455
<activity
55-
android:name=".function.FunctionActivity"
56+
android:name=".main.toolbox.functions.function.FunctionActivity"
5657
android:exported="true"
5758
android:label="@string/functionActivity"
5859
android:parentActivityName=".main.MainActivity" />
5960
<activity
60-
android:name=".random.RandomNumberActivity"
61+
android:name=".main.toolbox.functions.random.RandomNumberActivity"
6162
android:exported="true"
6263
android:label="@string/randomActivity"
6364
android:parentActivityName=".main.MainActivity"
@@ -73,7 +74,7 @@
7374
android:label="@string/settings"
7475
android:parentActivityName=".main.MainActivity" />
7576
<activity
76-
android:name=".finance.FinanceActivity"
77+
android:name=".main.toolbox.functions.finance.FinanceActivity"
7778
android:exported="true"
7879
android:label="@string/financeActivity"
7980
android:launchMode="singleTask"
@@ -85,7 +86,7 @@
8586
</intent-filter>
8687
</activity>
8788
<activity
88-
android:name=".shopping.ShoppingActivity"
89+
android:name=".main.toolbox.functions.shopping.ShoppingActivity"
8990
android:exported="true"
9091
android:label="@string/shoppingActivity"
9192
android:launchMode="singleTask"
@@ -97,7 +98,7 @@
9798
</intent-filter>
9899
</activity>
99100
<activity
100-
android:name=".relationship.RelationshipActivity"
101+
android:name=".main.toolbox.functions.relationship.RelationshipActivity"
101102
android:exported="true"
102103
android:label="@string/relationshipActivity"
103104
android:launchMode="singleTask"
@@ -109,7 +110,7 @@
109110
</intent-filter>
110111
</activity>
111112
<activity
112-
android:name=".ChineseNumberConversionActivity"
113+
android:name=".main.toolbox.functions.ChineseNumberConversionActivity"
113114
android:exported="true"
114115
android:label="@string/chineseNumberConverter"
115116
android:launchMode="singleTask"
@@ -121,7 +122,7 @@
121122
</intent-filter>
122123
</activity>
123124
<activity
124-
android:name=".currency.CurrencyActivity"
125+
android:name=".main.toolbox.functions.currency.CurrencyActivity"
125126
android:exported="true"
126127
android:label="@string/exchangeActivity"
127128
android:parentActivityName=".main.MainActivity">
@@ -132,7 +133,7 @@
132133
</intent-filter>
133134
</activity>
134135
<activity
135-
android:name=".BMIActivity"
136+
android:name=".main.toolbox.functions.BMIActivity"
136137
android:exported="true"
137138
android:label="@string/bmiActivity"
138139
android:launchMode="singleTask"
@@ -144,7 +145,7 @@
144145
</intent-filter>
145146
</activity>
146147
<activity
147-
android:name=".time.DateRangeActivity"
148+
android:name=".main.toolbox.functions.time.DateRangeActivity"
148149
android:exported="true"
149150
android:label="@string/dateActivity"
150151
android:launchMode="singleTask"
@@ -156,7 +157,7 @@
156157
</intent-filter>
157158
</activity>
158159
<activity
159-
android:name=".compass.Compass"
160+
android:name=".main.toolbox.functions.compass.Compass"
160161
android:exported="true"
161162
android:label="@string/compassActivity"
162163
android:launchMode="singleTask"
@@ -168,7 +169,7 @@
168169
</intent-filter>
169170
</activity>
170171
<activity
171-
android:name=".converter.UnitActivity"
172+
android:name=".main.toolbox.functions.converter.UnitActivity"
172173
android:exported="true"
173174
android:label="@string/ChangeActivity"
174175
android:launchMode="singleTask"
@@ -203,7 +204,7 @@
203204
android:theme="@style/AppTheme" />
204205

205206
<receiver
206-
android:name=".widgets.MyWidgetProvider"
207+
android:name=".features.MyWidgetProvider"
207208
android:exported="false"
208209
android:icon="@mipmap/ic_launcher"
209210
android:label="@string/app_name">
@@ -216,7 +217,7 @@
216217
android:resource="@xml/appwidget_provider" />
217218
</receiver>
218219
<receiver
219-
android:name=".widgets.MyWidgetProviderCalc1"
220+
android:name=".features.MyWidgetProviderCalc1"
220221
android:exported="false"
221222
android:icon="@mipmap/ic_launcher"
222223
android:label="@string/app_name">
@@ -230,7 +231,7 @@
230231
android:resource="@xml/appwidget_provider_calc1" />
231232
</receiver>
232233
<receiver
233-
android:name=".widgets.MyWidgetProviderCalc2"
234+
android:name=".features.MyWidgetProviderCalc2"
234235
android:exported="false"
235236
android:icon="@mipmap/ic_launcher"
236237
android:label="@string/app_name">
@@ -244,7 +245,7 @@
244245
android:resource="@xml/appwidget_provider_calc2" />
245246
</receiver>
246247

247-
<service android:name=".floating.FloatingWindow" />
248+
<service android:name=".features.FloatingWindow" />
248249

249250
<property
250251
android:name="android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /