Skip to content

Commit 71e0f5a

Browse files
ibrkhalilibrkhalil
authored
Merge branch 'develop' into mute-for-specific-amount-of-time
2 parents 5cdc6bd + c5de054 commit 71e0f5a

File tree

183 files changed

+2429
-2182
lines changed

Some content is hidden

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

183 files changed

+2429
-2182
lines changed

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.21.0
1+
1.22.0

‎ios/StatusIm.xcodeproj/project.pbxproj

+12-6
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,9 @@
417417
TestTargetID = 13B07F861A680F5B00A75B9A;
418418
};
419419
13B07F861A680F5B00A75B9A = {
420+
DevelopmentTeam = 8B5X2M6H2Y;
420421
LastSwiftMigration = 1140;
422+
ProvisioningStyle = Manual;
421423
SystemCapabilities = {
422424
com.apple.BackgroundModes = {
423425
enabled = 1;
@@ -841,8 +843,9 @@
841843
BUNDLE_ID_SUFFIX = .debug;
842844
CLANG_ENABLE_MODULES = YES;
843845
CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
844-
CODE_SIGN_IDENTITY = "Apple Development";
845-
CODE_SIGN_STYLE = Automatic;
846+
CODE_SIGN_IDENTITY = "iPhone Distribution";
847+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
848+
CODE_SIGN_STYLE = Manual;
846849
CUSTOM_PRODUCT_NAME = "Status Debug";
847850
DEAD_CODE_STRIPPING = YES;
848851
DEVELOPMENT_TEAM = 8B5X2M6H2Y;
@@ -895,7 +898,8 @@
895898
);
896899
PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
897900
PRODUCT_NAME = StatusIm;
898-
PROVISIONING_PROFILE_SPECIFIER = "";
901+
PROVISIONING_PROFILE = "9da75626-9594-43d9-a827-0f6d43c28f54";
902+
PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum";
899903
SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
900904
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
901905
SWIFT_VERSION = 5.0;
@@ -913,8 +917,9 @@
913917
BUNDLE_ID_SUFFIX = "";
914918
CLANG_ENABLE_MODULES = YES;
915919
CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
916-
CODE_SIGN_IDENTITY = "Apple Development";
917-
CODE_SIGN_STYLE = Automatic;
920+
CODE_SIGN_IDENTITY = "iPhone Developer";
921+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
922+
CODE_SIGN_STYLE = Manual;
918923
CUSTOM_PRODUCT_NAME = Status;
919924
DEAD_CODE_STRIPPING = YES;
920925
DEVELOPMENT_TEAM = 8B5X2M6H2Y;
@@ -959,7 +964,8 @@
959964
);
960965
PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
961966
PRODUCT_NAME = StatusIm;
962-
PROVISIONING_PROFILE_SPECIFIER = "";
967+
PROVISIONING_PROFILE = "e2202b12-7a66-4ff7-af3c-a52e35f32dc1";
968+
PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum";
963969
SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
964970
SWIFT_VERSION = 5.0;
965971
TARGETED_DEVICE_FAMILY = 1;

‎modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,15 @@ public void handleSignal(final String jsonEventString) {
149149
this.getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("gethEvent", params);
150150
}
151151

152-
private File getLogsFile() {
152+
private File getPublicStorageDirectory() {
153153
final Context context = this.getReactApplicationContext();
154154
// Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
155155
// https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
156-
final File pubDirectory = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
156+
return context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
157+
158+
}
159+
private File getLogsFile() {
160+
final File pubDirectory = this.getPublicStorageDirectory();
157161
final File logFile = new File(pubDirectory, gethLogFileName);
158162

159163
return logFile;
@@ -1170,8 +1174,8 @@ public String backupDisabledDataDir() {
11701174

11711175

11721176
@ReactMethod(isBlockingSynchronousMethod = true)
1173-
public String logFilePath() {
1174-
return getLogsFile().getAbsolutePath();
1177+
public String logFileDirectory() {
1178+
return getPublicStorageDirectory().getAbsolutePath();
11751179
}
11761180

11771181
@ReactMethod(isBlockingSynchronousMethod = true)

‎modules/react-native-status/ios/RCTStatus/RCTStatus.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ - (void) migrateKeystore:(NSString *)accountData
882882
return rootUrl.path;
883883
}
884884

885-
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(logFilePath) {
885+
RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(logFileDirectory) {
886886
NSFileManager *fileManager = [NSFileManager defaultManager];
887887
NSURL *rootUrl =[[fileManager
888888
URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]

‎src/js/worklets/bottom_sheet.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ export function useTranslateY(initialTranslationY, bottomSheetDy, panY) {
66
})
77
}
88

9-
export function useBackgroundOpacity(translateY, backgroundHeight, windowHeight) {
9+
export function useBackgroundOpacity(translateY, backgroundHeight, windowHeight, opacity) {
1010
return useDerivedValue(() => {
11-
const opacity = ((translateY.value - windowHeight) / -backgroundHeight) * 0.5
11+
const calculatedOpacity = ((translateY.value - windowHeight) / -backgroundHeight) * opacity
1212

13-
return Math.max(Math.min(opacity, 0.5), 0)
13+
return Math.max(Math.min(calculatedOpacity, opacity), 0)
1414
})
1515
}

‎src/quo2/components/common/unread_grey_dot/view.cljs

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[quo2.components.common.unread-grey-dot.style :as style]))
44

55
(defn unread-grey-dot
6-
[]
6+
[accessibility-label]
77
[rn/view
8-
{:style style/unread-grey-dot}])
8+
(cond-> {:style style/unread-grey-dot}
9+
accessibility-label (assoc :accessibility-label accessibility-label :accessible true))])

‎src/quo2/components/community/community_card_view.cljs

+6-8
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
:height 230
1717
:border-radius 20}
1818
:on-press on-press}
19-
[rn/view
20-
{:flex 1}
19+
[rn/view {:style style/detail-container}
2120
[rn/view (style/community-cover-container 60)
2221
[rn/image
2322
{:source cover
24-
:style
25-
{:flex 1
26-
:border-top-right-radius 20
27-
:border-top-left-radius 20}}]]
23+
:style {:flex 1
24+
:border-top-right-radius 20
25+
:border-top-left-radius 20}}]]
2826
[rn/view (style/card-view-content-container 12)
2927
[rn/view (style/card-view-chat-icon 48)
3028
[icon/community-icon {:images images} 48]]
@@ -38,7 +36,7 @@
3836
{:title name
3937
:description description}]
4038
[rn/view {:style (style/card-stats-position)}
41-
[community-view/community-stats-column :card-view]]
39+
[community-view/community-stats-column
40+
{:type :card-view}]]
4241
[rn/view {:style (style/community-tags-position)}
4342
[community-view/community-tags tags]]]]]]])
44-

‎src/quo2/components/community/community_list_view.cljs

+4-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
[counter/counter {:type :default} unread-mentions-count]
2828

2929
unread-messages?
30-
[unread-grey-dot]))
30+
[unread-grey-dot :unviewed-messages-public]))
3131

3232
(defn communities-list-view-item
3333
[props
@@ -46,7 +46,7 @@
4646
(merge {:style {:height 56
4747
:border-radius 16}}
4848
props)
49-
[rn/view {:flex 1}
49+
[rn/view {:style style/detail-container}
5050
[rn/view (style/list-info-container)
5151
[community-icon/community-icon
5252
{:images community-icon} 32]
@@ -64,7 +64,8 @@
6464
colors/neutral-40
6565
colors/neutral-60))}}
6666
name]
67-
[community-view/community-stats-column :list-view]]
67+
[community-view/community-stats-column
68+
{:type :list-view}]]
6869
(if (= status :gated)
6970
[community-view/permission-tag-container
7071
{:locked? locked?

‎src/quo2/components/community/community_view.cljs

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
[quo2.components.tags.permission-tag :as permission]
66
[quo2.components.tags.tag :as tag]
77
[quo2.foundations.colors :as colors]
8+
[quo.gesture-handler :as gesture-handler] ;;TODO move to quo2
89
[react-native.core :as rn]))
910

1011
(defn community-stats
@@ -23,7 +24,7 @@
2324
members-count]])
2425

2526
(defn community-stats-column
26-
[type]
27+
[{:keys [type]}]
2728
(let [icon-color (colors/theme-colors colors/neutral-50 colors/neutral-40)]
2829
[rn/view
2930
(if (= type :card-view)
@@ -41,7 +42,9 @@
4142

4243
(defn community-tags
4344
[tags]
44-
[rn/view (style/community-tags-container)
45+
[gesture-handler/scroll-view
46+
{:shows-horizontal-scroll-indicator false
47+
:horizontal true}
4548
(for [{:keys [name emoji]} tags]
4649
^{:key name}
4750
[rn/view {:margin-right 8}

‎src/quo2/components/community/style.cljs

+4-5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
colors/white
2323
colors/neutral-90)})
2424

25+
(def detail-container
26+
{:flex 1})
27+
2528
(defn stats-count-container
2629
[]
2730
{:flex-direction :row
@@ -37,10 +40,6 @@
3740
{:flex-direction :row
3841
:align-items :center})
3942

40-
(defn community-tags-container
41-
[]
42-
{:flex-direction :row})
43-
4443
(defn card-stats-position
4544
[]
4645
{:position :absolute
@@ -62,7 +61,7 @@
6261
:bottom 0
6362
:left 0
6463
:right 0
65-
:height 20
64+
:border-radius 20
6665
:padding-horizontal padding-horizontal
6766
:border-top-right-radius 16
6867
:border-top-left-radius 16

‎src/quo2/components/drawers/drawer_buttons/style.cljs

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
(ns quo2.components.drawers.drawer-buttons.style
2-
(:require [quo2.foundations.colors :as colors]))
2+
(:require [quo2.foundations.colors :as colors]
3+
[react-native.platform :as platform]))
34

4-
(def outer-container {:height 216})
5+
(def outer-container
6+
{:height 216
7+
:border-radius 20})
58

69
(def top-card
710
{:flex 1
811
:padding-vertical 12
912
:padding-horizontal 20
1013
:border-top-left-radius 20
1114
:border-top-right-radius 20
12-
:background-color colors/neutral-80})
15+
:background-color (if platform/ios?
16+
colors/neutral-80-opa-80-blur
17+
colors/neutral-80)})
1318

1419
(def bottom-card
1520
{:position :absolute
@@ -21,7 +26,7 @@
2126
:padding-horizontal 20
2227
:border-top-left-radius 20
2328
:border-top-right-radius 20
24-
:background-color (colors/alpha colors/white 0.05)})
29+
:background-color colors/white-opa-5})
2530

2631
(def bottom-container
2732
{:flex-direction :row
@@ -35,14 +40,14 @@
3540
:width 28
3641
:justify-content :center
3742
:align-items :center
38-
:border-color (colors/alpha colors/white 0.05)})
43+
:border-color colors/white-opa-5})
3944

4045
(def bottom-text
4146
{:flex 1
42-
:color (colors/alpha colors/white 0.7)})
47+
:color colors/white-70-blur})
4348

4449
(def top-text
45-
{:color (colors/alpha colors/white 0.7)})
50+
{:color colors/white-70-blur})
4651

4752
(defn heading-text
4853
[gap]

‎src/quo2/components/drawers/drawer_buttons/view.cljs

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[quo2.components.icon :as icon]
44
[quo2.components.markdown.text :as text]
55
[quo2.foundations.colors :as colors]
6+
[react-native.blur :as blur]
67
[quo2.components.drawers.drawer-buttons.style :as style]))
78

89
(defn render-bottom
@@ -70,7 +71,7 @@
7071
child-2 string, keyword or hiccup
7172
"
7273
[{:keys [container-style top-card bottom-card]} child-1 child-2]
73-
[rn/view
74+
[blur/ios-view
7475
{:style (merge container-style style/outer-container)}
7576
[card
7677
(merge {:gap 4

‎src/quo2/components/inputs/profile_input/view.cljs

+2-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
[rn/view {:style style/input-container}
4848
[title-input/title-input
4949
(merge title-input-props
50-
{:override-theme :dark
50+
{:blur? true
51+
:override-theme :dark
5152
:placeholder placeholder
5253
:customization-color customization-color})]]]))

‎src/quo2/components/inputs/title_input/style.cljs

+19-18
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,48 @@
22
(:require [quo2.foundations.colors :as colors]))
33

44
(defn get-focused-placeholder-color
5-
[blur?]
5+
[blur? override-theme]
66
(if blur?
7-
(colors/theme-colors colors/neutral-80-opa-20 (colors/alpha colors/white 0.2))
8-
(colors/theme-colors colors/neutral-30 colors/neutral-60)))
7+
(colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 override-theme)
8+
(colors/theme-colors colors/neutral-30 colors/neutral-60 override-theme))
9+
)
910

1011
(defn get-placeholder-color
11-
[blur?]
12+
[blur? override-theme]
1213
(if blur?
13-
(colors/theme-colors colors/neutral-80-opa-40 (colors/alpha colors/white 0.3))
14-
(colors/theme-colors colors/neutral-40 colors/neutral-50)))
14+
(colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 override-theme)
15+
(colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
1516

1617
(defn- get-disabled-color
17-
[blur?]
18+
[blur? override-theme]
1819
(if blur?
19-
(colors/theme-colors colors/neutral-80-opa-40 (colors/alpha colors/white 0.3))
20-
(colors/theme-colors colors/neutral-40 colors/neutral-50)))
20+
(colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30)
21+
(colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
2122

2223
(defn- get-char-count-color
23-
[blur?]
24+
[blur? override-theme]
2425
(if blur?
25-
(colors/theme-colors colors/neutral-80-opa-40 (colors/alpha colors/white 0.4))
26-
(colors/theme-colors colors/neutral-40 colors/neutral-50)))
26+
(colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40)
27+
(colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
2728

2829
(defn get-selection-color
29-
[customization-color blur?]
30+
[customization-color blur? override-theme]
3031
(if blur?
31-
(colors/theme-colors colors/neutral-100 colors/white)
32-
(colors/custom-color customization-color (if colors/dark? 60 50))))
32+
(colors/theme-colors colors/neutral-100 colors/white override-theme)
33+
(colors/custom-color customization-color (if (or (= :dark override-theme) colors/dark?) 60 50))))
3334

3435
(def text-input-container {:flex 1})
3536

3637
(defn title-text
3738
[disabled? blur? override-theme]
3839
{:text-align-vertical :bottom
3940
:color (if disabled?
40-
(get-disabled-color blur?)
41+
(get-disabled-color blur? override-theme)
4142
(colors/theme-colors colors/neutral-100 colors/white override-theme))})
4243

4344
(defn char-count
44-
[blur?]
45-
{:color (get-char-count-color blur?)})
45+
[blur? override-theme]
46+
{:color (get-char-count-color blur? override-theme)})
4647

4748
(def container
4849
{:flex-direction :row

0 commit comments

Comments
 (0)