Skip to content
This repository has been archived by the owner on Feb 4, 2022. It is now read-only.

Commit

Permalink
Merge pull request #497 from OkunaOrg/release/0.0.61
Browse files Browse the repository at this point in the history
Release/0.0.61
  • Loading branch information
lifenautjoe authored Dec 15, 2019
2 parents daf53a9 + 24e7a3b commit 42392a2
Show file tree
Hide file tree
Showing 21 changed files with 81 additions and 71 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ The change log for the Okuna app.
## Table of contents

- [Release 0.0.59](#release-0.0.59)
- [Release 0.0.61](#release-0.0.61)

## Release 0.0.61

#### Features
- 🏷 Change hashtags to be just like mentions
- 🏘 Make hashtags work in profile bios, community descriptions and rules
- ༕ Add Android festive icon

#### Bugs
- Fixed header color on communities and hashtags is color of theme with no icons

## Release 0.0.59

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/icon-adaptive-foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 30 additions & 28 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
89ABAE522203425900049DFB /* NotificationService.m in Sources */ = {isa = PBXBuildFile; fileRef = 89ABAE512203425900049DFB /* NotificationService.m */; };
89ABAE562203425900049DFB /* OneSignalNotificationServiceExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 89ABAE4E2203425900049DFB /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
89C44D0523A664EB00973156 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 898053AA22047AAF00E47AD9 /* Pods_Runner.framework */; };
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
Expand Down Expand Up @@ -331,6 +332,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
89C44D0523A664EB00973156 /* Pods_Runner.framework in Frameworks */,
B28D3FB500E916EAB5DDC3CB /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -1067,7 +1069,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1081,7 +1083,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
Expand Down Expand Up @@ -1156,7 +1158,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1170,7 +1172,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
Expand Down Expand Up @@ -1240,7 +1242,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1254,7 +1256,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
Expand Down Expand Up @@ -1329,7 +1331,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1343,7 +1345,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
Expand Down Expand Up @@ -1413,7 +1415,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1427,7 +1429,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
Expand All @@ -1450,7 +1452,7 @@
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1461,7 +1463,7 @@
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app.OneSignalNotificationServiceExtension;
Expand All @@ -1487,7 +1489,7 @@
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1498,7 +1500,7 @@
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app.OneSignalNotificationServiceExtension;
Expand All @@ -1524,7 +1526,7 @@
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1535,7 +1537,7 @@
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app.OneSignalNotificationServiceExtension;
Expand All @@ -1561,7 +1563,7 @@
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1572,7 +1574,7 @@
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app.OneSignalNotificationServiceExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1596,7 +1598,7 @@
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1607,7 +1609,7 @@
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app.OneSignalNotificationServiceExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1631,7 +1633,7 @@
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1642,7 +1644,7 @@
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app.OneSignalNotificationServiceExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1666,7 +1668,7 @@
CODE_SIGN_ENTITLEMENTS = OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1677,7 +1679,7 @@
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app.OneSignalNotificationServiceExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1804,7 +1806,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1818,7 +1820,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
Expand All @@ -1837,7 +1839,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 60;
CURRENT_PROJECT_VERSION = 62;
DEVELOPMENT_TEAM = GAR7B57RXU;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -1851,7 +1853,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 0.0.60;
MARKETING_VERSION = 0.0.62;
PRODUCT_BUNDLE_IDENTIFIER = social.openbook.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
Expand Down
1 change: 1 addition & 0 deletions lib/pages/home/pages/hashtag/widgets/hashtag_nav_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class OBHashtagNavBar extends StatelessWidget
mainAxisSize: MainAxisSize.min,
children: <Widget>[
OBHashtag(
textStyle: TextStyle(color: Colors.white),
hashtag: hashtag, rawHashtagName: rawHashtagName),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 3),
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/home/pages/menu/pages/settings/about.dart
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class OBAboutPageState extends State<OBAboutPage> {
ListTile(
leading: OBIcon(OBIcons.nativeInfo),
title: OBText(
'Okuna v0.0.59'
'Okuna v0.0.61'
),
),
],
Expand Down
13 changes: 0 additions & 13 deletions lib/services/theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -195,19 +195,6 @@ class ThemeService {
void setActiveTheme(OBTheme theme) {
_setActiveTheme(theme);
_storeActiveThemeId(theme.id);

Color primaryColor = Pigment.fromString(theme.primaryColor);

Brightness iconsBrightness = _utilsService.colorIsDark(primaryColor)
? Brightness.light
: Brightness.dark;

SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
statusBarBrightness: iconsBrightness,
statusBarIconBrightness: iconsBrightness,
systemNavigationBarIconBrightness: iconsBrightness,
systemNavigationBarColor: primaryColor,
statusBarColor: primaryColor));
}

void _bootstrap() async {
Expand Down
29 changes: 8 additions & 21 deletions lib/widgets/hashtag.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:Okuna/models/hashtag.dart';
import 'package:Okuna/provider.dart';
import 'package:Okuna/widgets/theming/text.dart';
import 'package:flutter/material.dart';
import 'package:flutter_advanced_networkimage/provider.dart';

Expand All @@ -19,48 +20,34 @@ class OBHashtag extends StatelessWidget {

@override
Widget build(BuildContext context) {
OpenbookProviderState openbookProvider = OpenbookProvider.of(context);
var utilsService = openbookProvider.utilsService;
TextStyle finalTextStyle = TextStyle(fontWeight: FontWeight.bold);

Color hashtagBackgroundColor = utilsService.parseHexColor(hashtag.color);
Color hashtagTextColor = utilsService.parseHexColor(hashtag.textColor);
if(textStyle != null) finalTextStyle = finalTextStyle.merge(textStyle);

TextStyle finalTextStyle = textStyle ?? TextStyle();

finalTextStyle = finalTextStyle
.merge(TextStyle(color: hashtagTextColor, fontWeight: FontWeight.bold));

Widget hashtagContent = Text(
rawHashtagName ?? hashtag.name,
Widget hashtagContent = OBText(
'#' + (rawHashtagName ?? hashtag.name),
style: finalTextStyle,
);

if (hashtag.hasEmoji()) {
hashtagContent = Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
hashtagContent,
Padding(
padding: const EdgeInsets.only(right: 4),
padding: const EdgeInsets.only(left: 2),
child: Image(
height: 15,
image: AdvancedNetworkImage(hashtag.emoji.image,
useDiskCache: true),
)),
hashtagContent
],
);
}

return GestureDetector(
onTap: onPressed != null ? () => onPressed(hashtag) : null,
child: Container(
decoration: BoxDecoration(
color: hashtagBackgroundColor,
borderRadius: BorderRadius.circular(5),
),
padding: const EdgeInsets.symmetric(horizontal: 2.5),
child: hashtagContent,
),
child: hashtagContent
);
}
}
Loading

0 comments on commit 42392a2

Please sign in to comment.