Skip to content

Commit ad5ef14

Browse files
committed
Stacking warning fix and versioning
1 parent 2b7a6b4 commit ad5ef14

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if (flutterRoot == null) {
1313

1414
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1515
if (flutterVersionCode == null) {
16-
flutterVersionCode = '371'
16+
flutterVersionCode = '372'
1717
}
1818

1919
def flutterVersionName = localProperties.getProperty('flutter.versionName')

ios/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@
536536
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
537537
CODE_SIGN_IDENTITY = "Apple Development";
538538
CODE_SIGN_STYLE = Automatic;
539-
CURRENT_PROJECT_VERSION = 371;
539+
CURRENT_PROJECT_VERSION = 372;
540540
DEVELOPMENT_ASSET_PATHS = "";
541541
DEVELOPMENT_TEAM = 53KVJRJS99;
542542
ENABLE_BITCODE = NO;
@@ -680,7 +680,7 @@
680680
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
681681
CODE_SIGN_IDENTITY = "Apple Development";
682682
CODE_SIGN_STYLE = Automatic;
683-
CURRENT_PROJECT_VERSION = 371;
683+
CURRENT_PROJECT_VERSION = 372;
684684
DEVELOPMENT_ASSET_PATHS = "";
685685
DEVELOPMENT_TEAM = 53KVJRJS99;
686686
ENABLE_BITCODE = NO;
@@ -718,7 +718,7 @@
718718
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
719719
CODE_SIGN_IDENTITY = "Apple Development";
720720
CODE_SIGN_STYLE = Automatic;
721-
CURRENT_PROJECT_VERSION = 371;
721+
CURRENT_PROJECT_VERSION = 372;
722722
DEVELOPMENT_ASSET_PATHS = "";
723723
DEVELOPMENT_TEAM = 53KVJRJS99;
724724
ENABLE_BITCODE = NO;

lib/main.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ import 'package:workmanager/workmanager.dart';
5555

5656
// TODO: CONFIGURE FOR APP RELEASE, include exceptions in Drawer if applicable
5757
const String appVersion = '3.2.5';
58-
const String androidCompilation = '371';
59-
const String iosCompilation = '371';
58+
const String androidCompilation = '372';
59+
const String iosCompilation = '372';
6060

6161
final FirebaseAnalytics analytics = FirebaseAnalytics.instance;
6262

lib/providers/webview_provider.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ class WebViewProvider extends ChangeNotifier {
10811081
void _callAssessMethods() {
10821082
final tab = _tabList[_currentTab];
10831083
if (tab.currentUrl!.contains("gym.php") || tab.currentUrl!.contains("index.php?page=hunting")) {
1084-
tab.webViewKey?.currentState?.assessEnergyWarning();
1084+
tab.webViewKey?.currentState?.assessEnergyWarning(tab.currentUrl.toString());
10851085
}
10861086
}
10871087

lib/utils/changelog.dart

+5-3
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,18 @@ class ChangeLogState extends State<ChangeLog> {
3939
void _createItems() {
4040
final itemList = <ChangeLogItem>[];
4141

42-
// Build 371 - 03/01/2024
42+
// Build 372 - 03/01/2024
4343

4444
// VERSION 3.2.5
4545
final v3_2_5 = ChangeLogItem();
4646
v3_2_5.version = 'Torn PDA v3.2.5';
4747
v3_2_5.date = '10 JAN 2024';
48-
const String feat3_2_5_1 = "Fixed Company Stock Order example userscript";
49-
const String feat3_2_5_2 = "Updated browser to fix reported issues";
48+
const String feat3_2_5_1 = "Fixed Company Stock Order example userscript [Kwack]";
49+
const String feat3_2_5_2 = "Fixed energy stacking warning in certain devices";
50+
const String feat3_2_5_3 = "Updated browser to fix reported issues";
5051
v3_2_5.features.add(feat3_2_5_1);
5152
v3_2_5.features.add(feat3_2_5_2);
53+
v3_2_5.features.add(feat3_2_5_3);
5254

5355
// VERSION 3.2.4
5456
final v3_2_4 = ChangeLogItem();

lib/widgets/webviews/webview_full.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -3704,11 +3704,11 @@ class WebViewFullState extends State<WebViewFull> with WidgetsBindingObserver {
37043704
}
37053705

37063706
// ASSESS GYM
3707-
Future assessEnergyWarning() async {
3707+
Future assessEnergyWarning(String targetUrl) async {
37083708
if (!mounted) return;
37093709
if (!_settingsProvider.warnAboutExcessEnergy && !_settingsProvider.warnAboutChains) return;
37103710

3711-
final easyUrl = _currentUrl.replaceAll('#', '');
3711+
final easyUrl = targetUrl.replaceAll('#', '');
37123712
if (easyUrl.contains('www.torn.com/gym.php') || easyUrl.contains('index.php?page=hunting')) {
37133713
final stats = await Get.find<ApiCallerController>().getBars();
37143714
if (stats is BarsModel) {

0 commit comments

Comments
 (0)