Commit Graph

282 Commits

Author SHA1 Message Date
alansley
4d7e4b9e2c Merge branch 'dev' into strings-squashed 2024-08-27 08:19:53 +10:00
alansley
3c576053a3 Moved into libsession for ease of access to control message view creation 2024-08-26 17:11:45 +10:00
ThomasSession
1393335121
Feature/debug menu (#1645)
* Reorganised cells

* Clipping content

* Simplifying Cell and leaving responsibility to modifier and content

* Fixing animations

Also fixing compose copy that wasn't set up properly...

* Debug menu

Added a debug menu
It can be accessed from the settings page or via an app shortcut (from the app icon)

* Finalising the debug menu

We can now switch environments between mainnet and testnet

* Update app/src/main/java/org/thoughtcrime/securesms/debugmenu/DebugMenu.kt

Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>

---------

Co-authored-by: AL-Session <160798022+AL-Session@users.noreply.github.com>
2024-08-26 13:09:37 +10:00
alansley
b908a54a44 Merge branch 'dev' into strings-squashed 2024-08-26 11:54:09 +10:00
alansley
404fb8001c Performed a PR pass to fix up anything obvious - there's still a few things left TODO 2024-08-26 11:52:41 +10:00
ThomasSession
0fa8a6e3d3 Merge branch 'dev' into release/1.19.2 2024-08-21 16:05:17 +10:00
alansley
2192c2c007 Merge branch 'dev' into strings-squashed 2024-08-21 13:28:16 +10:00
AL-Session
ab2e3744a9
Replaced MLKit with ZXing for QR code scanning (#1630)
* Replaced MLKit with ZXing for QR code scanning

* Adjusted some comment spacing

* Adjusted some comment phrasing

* Renamed MaybeScanQrCode to QRScannerScreen & removed double-import of ZXing core + removed ZXing android-integration

---------

Co-authored-by: alansley <aclansley@gmail.com>
2024-08-21 12:10:55 +10:00
alansley
e812527358 Merge branch 'dev' into strings-squashed 2024-08-20 13:27:35 +10:00
ThomasSession
43c6e86da0 Bumped version code 2024-08-20 11:56:15 +10:00
Fanchao Liu
16d6efbb5b
SES-2524 - Rewrite media gallery in Compose (#1619) 2024-08-19 13:46:38 +10:00
Al Lansley
eecce08c25 Merge branch 'dev' into strings-squashed 2024-08-15 09:38:10 +10:00
fanchao
50929b8970 Merge remote-tracking branch 'origin/dev' into release/1.19.1
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
#	gradle.properties
2024-08-14 10:47:16 +10:00
fanchao
4c52e66c0c Updated flexbox and removed unused libraries, turn off configuration cache 2024-08-13 14:03:50 +10:00
ThomasSession
d82c5b6a1b Migrate exoplayer to media3 2024-08-13 13:57:40 +10:00
fanchao
2bf8bc17b5 Added stickyheader AAR 2024-08-13 13:50:21 +10:00
ThomasSession
84896f8d23 Updated to latest web-rtc library
It seems setWebRtcBasedAcousticEchoCanceler and setBlacklistDeviceForOpenSLESUsage are no longer available.
What this means is unclear and the new library might be handling certain things internally
2024-08-13 13:49:57 +10:00
ThomasSession
26b186452a Replace image cropping library 2024-08-13 13:49:57 +10:00
ThomasSession
518fe5e712 Bump version name 2024-08-13 13:49:10 +10:00
alansley
f309263e39 Merge dev 2024-08-09 11:39:13 +10:00
ThomasSession
f865f9f8ed Merge branch 'dev' into merge/1.19.0 2024-08-08 10:55:55 +10:00
ThomasSession
4e50701c90 version code bump 2024-08-08 09:30:58 +10:00
alansley
76a74f7e9f Upgraded firebase from v18.0.0 to v24.0.0 2024-08-07 15:31:19 +10:00
ThomasSession
2b8d2d49e8 Making sure we do not have AD_ID in the app 2024-08-07 12:50:14 +10:00
alansley
5cbe289a8d Merge dev and cleanup 2024-08-06 11:30:50 +10:00
ThomasSession
982e23be30
Merge branch 'dev' into release/1.19.0 2024-08-05 15:08:06 +10:00
ThomasSession
8d15169c93 Version bump to go above last live version 2024-08-01 09:03:13 +10:00
alansley
3cee4bc12f Removed some legacy strings & substituted others 2024-07-26 13:57:09 +10:00
fanchao
aa1db13e3a Initial squash merge for strings 2024-07-26 11:34:05 +10:00
Fanchao Liu
631d93c20c
Replace kapt with ksp and update dependencies (#1560) 2024-07-24 16:18:18 +10:00
ThomasSession
fc5c7a7528
Merge pull request #1566 from oxen-io/release/1.18.6
Bumping version for 1.18.6
2024-07-24 10:51:11 +10:00
ThomasSession
530853b94f Bumping version for 1.18.6 2024-07-24 10:38:40 +10:00
ThomasSession
9c3513f68e
Merge pull request #1563 from oxen-io/release/1.18.5
Release/1.18.5
2024-07-23 18:28:40 +10:00
ThomasSession
9957edd5ac Bumping version code and removing permission (might add it back if we get reviewed in time) 2024-07-22 10:51:54 +10:00
ThomasSession
4b7f5d3cb5 1.19.0 - Bumping release version and code 2024-07-19 16:42:51 +10:00
ThomasSession
9e2b24f7b9
Feature/compose cleanup (#1543)
* Moving color files

* Moving theme classes into their own package

* Only obtain new theme when required

* UI Tweaks

Using the proper color for danger as opposed to one hardcoded color
Reusing BlackAlpha40
Using the right delete icon in settings

* matching figma

* Matching signature across buttons

* Dialogs do not have a 'x' button by default

* Updated typography

Updated the typography in an composition local so it can be accessed from anyehere in compose and matching the figma declarations.

* Centered text in control messages

* Fixing new color access for action items

* renaming spacing to be more general

* Unifying dimensions and rectifying design inconsistencies

Unifying spacing values and reusing common ones
Identified spacing issues and inconsistencies in design and figma

* Rounded corners for the new conversation sheet

* Rounding sheets corners

* Spacing fixes and UI consolidating

Discussed with QA to make sure the 'new message' screen should  indeed behave as the other screens and use disabled state instead of disappearing

* Disappearing messages tweaks

Re-using our new radio buttons in disappearing messages
Tweaking UI to match designs

* Cleaning up spaces

* Migrating to Material3

* Fixing UI issues found

* PR feedbacks

---------

Co-authored-by: bemusementpark <bemusementpark>
2024-07-18 16:32:03 +10:00
bemusementpark
ce1790a895 Merge branch 'od' into on-2 2024-07-16 18:09:27 +09:30
AL-Session
1ca62629f6
SS-40 - MMS Notification Strings (#1541)
* Feature implemented

* Removed stray quotation mark

* Cleanup WIP

* Cleanup

* Addressed PR feedback

* Addressed further PR feedback

---------

Co-authored-by: alansley <aclansley@gmail.com>
2024-07-16 11:28:50 +10:00
bemusementpark
30ee3946ef Merge branch 'od' into on-2 2024-07-11 15:07:46 +09:30
AL-Session
2e3acd902f
SS-2168 - User profile warnings (#1531)
* Profile picture upload fail informs user

* End of day push

* Push before trying with okhttp library update

* WIP

* Further WIP

* Add additional debug comments

* Push before cleanup

* Cleaned up

* More cleanup

* Minor adjustment

* Final cleanup prior to PR review

* Removed commented out old conscrypt version import

* Addressed PR feeback from Fanchao

---------

Co-authored-by: alansley <aclansley@gmail.com>
2024-07-09 16:23:26 +10:00
ThomasSession
2b27b7d5e0 Bumping the version code and name 2024-07-09 09:33:06 +10:00
bemusementpark
7111bb7725 Merge branch 'od' into on-2 2024-07-03 12:12:51 +09:30
Fanchao Liu
fec67e282a
[SES-2018] Refactor mention (#1510)
* Refactor mention

* Fixes robolectric test problem

* Fixes tests

* Naming and comments

* Naming

* Dispatcher

---------

Co-authored-by: fanchao <git@fanchao.dev>
2024-07-01 17:31:03 +10:00
Andrew
9ee2b9207b Remove deprecated accompanist-pager 2024-06-11 09:58:18 +09:30
Andrew
50addd644c Merge branch 'on' into on-2 2024-06-06 09:21:49 +09:30
Andrew
59910eeb48 Merge branch 'dev' into on 2024-05-30 11:09:51 +09:30
Andrew
9b6fa0db01
Update version for release-1.18.4 2024-05-30 09:38:33 +09:30
Andrew
9d22e86a2f Merge master into dev 2024-05-24 12:03:52 +09:30
Andrew
cf13caaee4
Bump canonicalVersionCode 2024-05-17 16:25:19 +09:30
Andrew
44f47662a7
Update version 1.18.3 2024-05-17 14:07:33 +09:30