Merge branch 'trunk' of git.openprivacy.ca:flutter/flutter_app into flix
This commit is contained in:
commit
94ba40a557
|
@ -36,4 +36,5 @@
|
|||
android:name="flutterEmbedding"
|
||||
android:value="2" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
|
|
|
@ -163,7 +163,7 @@ class MainActivity: FlutterActivity() {
|
|||
"ImportBundle" -> {
|
||||
val profile = (call.argument("ProfileOnion") as? String) ?: "";
|
||||
val bundle = (call.argument("bundle") as? String) ?: "";
|
||||
Cwtch.blockContact(profile, bundle);
|
||||
Cwtch.importBundle(profile, bundle);
|
||||
}
|
||||
"SetGroupAttribute" -> {
|
||||
val profile = (call.argument("ProfileOnion") as? String) ?: "";
|
||||
|
|
Binary file not shown.
|
@ -227,7 +227,7 @@ class ContactInfoState extends ChangeNotifier {
|
|||
int _totalMessages = 0;
|
||||
DateTime _lastMessageTime;
|
||||
|
||||
// todo: a nicer way to mdoel contats, groups and other "entities"
|
||||
// todo: a nicer way to model contacts, groups and other "entities"
|
||||
bool _isGroup;
|
||||
String _server;
|
||||
|
||||
|
@ -324,7 +324,7 @@ class ContactInfoState extends ChangeNotifier {
|
|||
get server => this._server;
|
||||
|
||||
bool isOnline() {
|
||||
if (this.isGroup) {
|
||||
if (this.isGroup == true) {
|
||||
return this.status == "Synced";
|
||||
} else {
|
||||
return this.status == "Authenticated";
|
||||
|
|
|
@ -231,7 +231,7 @@ class _AddContactViewState extends State<AddContactView> {
|
|||
}
|
||||
if (globalErrorHandler.importBundleError) {
|
||||
return AppLocalizations.of(context).invalidImportString;
|
||||
} else if (globalErrorHandler.explicitAddContactSuccess) {}
|
||||
} else if (globalErrorHandler.importBundleSuccess) {}
|
||||
return null;
|
||||
},
|
||||
onChanged: (String importBundle) async {
|
||||
|
|
|
@ -6,6 +6,7 @@ import 'package:flutter_app/model.dart';
|
|||
import 'package:flutter_app/widgets/buttontextfield.dart';
|
||||
import 'package:flutter_app/widgets/cwtchlabel.dart';
|
||||
import 'package:flutter_app/widgets/passwordfield.dart';
|
||||
import 'package:flutter_app/widgets/profileimage.dart';
|
||||
import 'package:flutter_app/widgets/textfield.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
|
@ -82,24 +83,7 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
|||
Visibility(
|
||||
visible: Provider.of<ProfileInfoState>(context).onion.isNotEmpty,
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
|
||||
SizedBox(
|
||||
width: 120,
|
||||
height: 120,
|
||||
child: ClipOval(
|
||||
child: SizedBox(
|
||||
width: 120,
|
||||
height: 120,
|
||||
child: Container(
|
||||
color: Colors.white,
|
||||
width: 120,
|
||||
height: 120,
|
||||
child: Image(
|
||||
image: AssetImage("assets/" + Provider.of<ProfileInfoState>(context).imagePath),
|
||||
width: 100,
|
||||
height: 100,
|
||||
))),
|
||||
),
|
||||
)
|
||||
ProfileImage(imagePath: Provider.of<ProfileInfoState>(context).imagePath, diameter: 120, maskOut: false, border: theme.theme.portraitOnlineBorderColor(),)
|
||||
])),
|
||||
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
|
||||
CwtchLabel(label: AppLocalizations.of(context).displayNameLabel),
|
||||
|
|
Loading…
Reference in New Issue