Skip to content

Commit

Permalink
Merge pull request #53 from atsign-foundation/fix/flickering
Browse files Browse the repository at this point in the history
chore: 1.0.6+40 release changes
  • Loading branch information
sachins-geekyants authored Nov 29, 2022
2 parents 4273ad9 + 6fdd230 commit f66c507
Show file tree
Hide file tree
Showing 10 changed files with 337 additions and 208 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.atsign.arrive"
minSdkVersion 24
targetSdkVersion 30
targetSdkVersion 31
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
3 changes: 2 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize">
android:windowSoftInputMode="adjustResize"
android:exported="true">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
Expand Down
6 changes: 3 additions & 3 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 39;
CURRENT_PROJECT_VERSION = 40;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -493,7 +493,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 39;
CURRENT_PROJECT_VERSION = 40;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -528,7 +528,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 39;
CURRENT_PROJECT_VERSION = 40;
DEVELOPMENT_TEAM = 5XUSS6C2DF;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand Down
434 changes: 268 additions & 166 deletions lib/common_components/change_atsign_bottom_sheet.dart

Large diffs are not rendered by default.

24 changes: 17 additions & 7 deletions lib/screens/home/home_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -166,19 +166,30 @@ class _HomeScreenState extends State<HomeScreen>
await _positionStream!.cancel();
}

LatLng? _lastUpdatedLocation;

_positionStream = Geolocator.getPositionStream(
locationSettings: LocationSettings(distanceFilter: 2))
.listen((locationStream) async {
if (mounted) {
setState(() {
myLatLng =
LatLng(locationStream.latitude, locationStream.longitude);
});
}
var _newLoc = LatLng(locationStream.latitude, locationStream.longitude);
if (mounted
&& (_lastUpdatedLocation == null ||
(differenceInMeters(_lastUpdatedLocation!, _newLoc) > 2))
) {
setState(() {
myLatLng = _newLoc;
});
_lastUpdatedLocation = _newLoc;
}
});
}
}

double differenceInMeters(LatLng _previousLoc, LatLng _newLoc){
return Geolocator.distanceBetween(_newLoc.latitude, _newLoc.longitude, _previousLoc.latitude, _previousLoc.longitude);
}


// ignore: always_declare_return_types
cleanKeychain() async {
var _keyChainManager = KeyChainManager.getInstance();
Expand Down Expand Up @@ -277,7 +288,6 @@ class _HomeScreenState extends State<HomeScreen>
: SizedBox(),
contactsLoaded!
? ProviderHandler<LocationProvider>(
key: UniqueKey(),
functionName: locationProvider.GET_ALL_NOTIFICATIONS,
showError: false,
load: (provider) => {},
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/splash/splash.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class _SplashState extends State<Splash> {
}
final result = await AtOnboarding.onboard(
context: NavService.navKey.currentContext!,
atsign: currentatSign == null ? '' : atSignList?.first,
atsign: currentatSign,
config: AtOnboardingConfig(
domain: MixedConstants.ROOT_DOMAIN,
atClientPreference:
Expand Down
1 change: 1 addition & 0 deletions lib/utils/constants/text_strings.dart
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class TextStrings {
static const pleaseTryAgain = 'Please, try again!';
static const locationPermissionAlreadyRunning =
' A request for location permissions is already running, please wait for it to complete before doing another request.';
static const sidebarSwitchOut = 'Switch atSign';
// Splash Screen
static const stayConnected = 'Stay connected!';
static const whereEver = 'Wherever';
Expand Down
7 changes: 7 additions & 0 deletions lib/utils/constants/text_styles.dart
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,11 @@ class CustomTextStyles {
letterSpacing: 0.1,
fontWeight: FontWeight.w700,
);

TextStyle blackBold({int size = 16}) => TextStyle(
color: Colors.black,
fontSize: size.toFont,
letterSpacing: 0.1,
fontWeight: FontWeight.w700,
);
}
58 changes: 30 additions & 28 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ packages:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "3.3.2"
version: "3.3.5"
args:
dependency: transitive
description:
Expand All @@ -35,7 +35,7 @@ packages:
name: asn1lib
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.1"
version: "1.4.0"
async:
dependency: transitive
description:
Expand All @@ -49,7 +49,7 @@ packages:
name: at_backupkey_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.7"
version: "4.0.8"
at_base2e15:
dependency: transitive
description:
Expand All @@ -63,7 +63,7 @@ packages:
name: at_client
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.41"
version: "3.0.45"
at_client_mobile:
dependency: "direct main"
description:
Expand All @@ -84,7 +84,7 @@ packages:
name: at_commons
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.29"
version: "3.0.30"
at_contact:
dependency: "direct main"
description:
Expand Down Expand Up @@ -123,9 +123,11 @@ packages:
at_location_flutter:
dependency: "direct main"
description:
name: at_location_flutter
url: "https://pub.dartlang.org"
source: hosted
path: "packages/at_location_flutter"
ref: "feat/manual-filter"
resolved-ref: b28ca4e4d697c2c2175866217c943f8c80fb13bb
url: "https://github.com/atsign-foundation/at_widgets.git"
source: git
version: "3.1.8"
at_lookup:
dependency: "direct main"
Expand All @@ -147,14 +149,14 @@ packages:
name: at_persistence_secondary_server
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.40"
version: "3.0.43"
at_persistence_spec:
dependency: transitive
description:
name: at_persistence_spec
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.7"
version: "2.0.9"
at_server_status:
dependency: transitive
description:
Expand All @@ -168,7 +170,7 @@ packages:
name: at_sync_ui_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.7"
version: "1.0.8"
at_utf7:
dependency: transitive
description:
Expand Down Expand Up @@ -203,7 +205,7 @@ packages:
name: cached_network_image
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.2"
version: "3.2.3"
cached_network_image_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -266,7 +268,7 @@ packages:
name: cron
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.0"
version: "0.5.1"
cross_file:
dependency: transitive
description:
Expand All @@ -287,7 +289,7 @@ packages:
name: crypton
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
version: "2.1.0"
csslib:
dependency: transitive
description:
Expand Down Expand Up @@ -371,7 +373,7 @@ packages:
name: file_selector_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.0"
version: "2.4.0"
file_selector_web:
dependency: transitive
description:
Expand Down Expand Up @@ -505,7 +507,7 @@ packages:
name: geolocator_apple
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.2"
version: "2.2.3"
geolocator_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -533,7 +535,7 @@ packages:
name: glob
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.1.1"
hive:
dependency: "direct main"
description:
Expand Down Expand Up @@ -687,7 +689,7 @@ packages:
name: mutex
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.0"
version: "3.0.1"
nested:
dependency: transitive
description:
Expand Down Expand Up @@ -792,7 +794,7 @@ packages:
name: path_provider_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.20"
version: "2.0.22"
path_provider_ios:
dependency: transitive
description:
Expand Down Expand Up @@ -946,7 +948,7 @@ packages:
name: pub_semver
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.2"
version: "2.1.3"
qr_code_scanner:
dependency: transitive
description:
Expand All @@ -960,7 +962,7 @@ packages:
name: rxdart
url: "https://pub.dartlang.org"
source: hosted
version: "0.27.5"
version: "0.27.7"
share_plus:
dependency: transitive
description:
Expand Down Expand Up @@ -988,7 +990,7 @@ packages:
name: share_plus_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.2"
version: "3.2.0"
share_plus_web:
dependency: transitive
description:
Expand Down Expand Up @@ -1086,7 +1088,7 @@ packages:
name: shelf_web_socket
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
version: "1.0.3"
showcaseview:
dependency: transitive
description:
Expand Down Expand Up @@ -1133,14 +1135,14 @@ packages:
name: sqflite
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0+1"
version: "2.2.0+3"
sqflite_common:
dependency: transitive
description:
name: sqflite_common
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.0"
version: "2.4.0+2"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -1231,14 +1233,14 @@ packages:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.6"
version: "6.1.7"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.19"
version: "6.0.22"
url_launcher_ios:
dependency: transitive
description:
Expand Down Expand Up @@ -1287,7 +1289,7 @@ packages:
name: uuid
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.6"
version: "3.0.7"
vector_math:
dependency: transitive
description:
Expand Down
8 changes: 7 additions & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.6+39
version: 1.0.6+40
environment:
sdk: ">=2.12.0 <3.0.0"
dependencies:
Expand Down Expand Up @@ -52,6 +52,12 @@ dependency_overrides:
geolocator: ^9.0.2
# on updating to compileSdkVersion 33, we need to upgrade this,
permission_handler: ^10.2.0
at_location_flutter:
git:
url: https://github.com/atsign-foundation/at_widgets.git
path: packages/at_location_flutter
ref: feat/manual-filter


# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
Expand Down

0 comments on commit f66c507

Please sign in to comment.