Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b063ecb
Merge pull request #601 from AOSSIE-Org/dev
M4dhav Nov 13, 2025
2647373
feat(l10n): add complete Bengali (bn) translation support
codealchemist007 Dec 8, 2025
dd0a526
fix(l10n): Ensure correct Bengali (bn) content is included in app_bn.arb
codealchemist007 Dec 8, 2025
2247123
fix(l10n): Final fix for locale identifier and file generation
codealchemist007 Dec 9, 2025
9d51ceb
Merge branch 'dev' into translation-bn
codealchemist007 Dec 9, 2025
ae47607
fix(l10n): Resolve final inheritance error to enable Bengali localiza…
codealchemist007 Dec 9, 2025
b5b2d1a
fix(review): Address all remaining mentor feedback and finalize local…
codealchemist007 Dec 9, 2025
a4ab527
fix(review): Address all remaining mentor feedback and finalize local…
codealchemist007 Dec 9, 2025
a49d0f3
Merge branch 'translation-bn' of https://github.com/codealchemist007/…
codealchemist007 Dec 9, 2025
5020e56
Merge branch 'translation-bn' of https://github.com/codealchemist007/…
codealchemist007 Dec 9, 2025
7bc816c
Merge branch 'translation-bn' of https://github.com/codealchemist007/…
codealchemist007 Dec 9, 2025
f2be019
Merge branch 'translation-bn' of https://github.com/codealchemist007/…
codealchemist007 Dec 9, 2025
0ee9fc8
Merge branch 'translation-bn' of https://github.com/codealchemist007/…
codealchemist007 Dec 11, 2025
173227c
chore: revert accidental changes to build.gradle.kts
codealchemist007 Dec 17, 2025
50c8e05
docs(lang): fix typos in Bengali localization and revert metadata str…
codealchemist007 Dec 19, 2025
b18f6c5
fix(lang): refined Bengali translations and corrected brand translite…
codealchemist007 Dec 19, 2025
31894b1
fix(lang): refined Bengali translations and corrected brand translite…
codealchemist007 Dec 19, 2025
a1f3b83
Merge branch 'translation-bn' of https://github.com/codealchemist007/…
codealchemist007 Dec 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions .metadata
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled.
# This file should be version controlled and should not be manually edited.

version:
revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
channel: stable
revision: "19074d12f7eaf6a8180cd4036a430c1d76de904e"
channel: "stable"

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
base_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
- platform: android
create_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
base_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
- platform: ios
create_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
base_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
create_revision: 19074d12f7eaf6a8180cd4036a430c1d76de904e
base_revision: 19074d12f7eaf6a8180cd4036a430c1d76de904e
- platform: windows
create_revision: 19074d12f7eaf6a8180cd4036a430c1d76de904e
base_revision: 19074d12f7eaf6a8180cd4036a430c1d76de904e

# User provided section

Expand Down
21 changes: 17 additions & 4 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,23 @@ println("PROJECT_ID: $projectId")
buildTypes {
signingConfigs {
create("release") {
keyAlias = keystoreProperties["keyAlias"] as String
keyPassword = keystoreProperties["keyPassword"] as String
storeFile = keystoreProperties["storeFile"]?.let { file(it) }
storePassword = keystoreProperties["storePassword"] as String
val keyAliasProp = keystoreProperties.getProperty("keyAlias")
val keyPasswordProp = keystoreProperties.getProperty("keyPassword")
val storeFileProp = keystoreProperties.getProperty("storeFile")
val storePasswordProp = keystoreProperties.getProperty("storePassword")

if (!keyAliasProp.isNullOrBlank()) {
keyAlias = keyAliasProp
}
if (!keyPasswordProp.isNullOrBlank()) {
keyPassword = keyPasswordProp
}
if (!storeFileProp.isNullOrBlank()) {
storeFile = file(storeFileProp)
}
if (!storePasswordProp.isNullOrBlank()) {
storePassword = storePasswordProp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this changed?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where I didn't get it and I'm sure that I didn't make any changes here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert the file

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I've reverted this file as you said.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert these changes, they are still a part of the PR

}
}
}
release {
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="appwrite-callback-${PROJECT_ID}" />
<data android:scheme="appwrite-callback-resonate" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this changed?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The android:scheme was changed to appwrite-callback-resonate to ensure the OAuth 2.0 callback URL is correctly configured. This scheme must match the callback URL registered on the Appwrite server to securely and correctly redirect the user back to the Resonate app after external authentication (e.g., Google or GitHub login). This change was required to fix the token passing issue during the login flow.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no token parsing issue. The use of dynamic variables is necessary there so that Project IDs can be injected at compile time, as they differ for projects on the cloud

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change it back as this is a breaking change

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm now I get it & I've also made the necessary change for this.

</intent-filter>
</activity>

Expand Down
3 changes: 2 additions & 1 deletion ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleLocalizations</key>
<array>
<string>hi</string>
<string>bn</string>
<string>en</string>
<string>hi</string>
<string>gu</string>
<string>kn</string>
<string>mr</string>
Expand Down
1 change: 1 addition & 0 deletions l10n.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ output-localization-file: app_localizations.dart
supported-locales:
- en
- hi
- bn
untranslated-messages-file: untranslated.txt
2 changes: 1 addition & 1 deletion lib/controllers/live_chapter_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class LiveChapterController extends GetxController {
'payload': {
'title': 'Live Chapter Starting!',
'body':
"${authStateController.displayName} is starting a Live Chapter in ${storyName}: ${liveChapterData.chapterTitle}. Tune In!",
"${authStateController.displayName} is starting a Live Chapter in $storyName: ${liveChapterData.chapterTitle}. Tune In!",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is not part of the scope of this PR

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops! sorry for that could have been my mistake.

},
});
var results = await functions.createExecution(
Expand Down
Loading