Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	settings.gradle.kts
  • Loading branch information
saharulik committed Mar 30, 2024
2 parents 6bbe2ab + d76d73a commit df77ab9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
tools:targetApi="31">
tools:targetApi="34">
<activity
android:name=".MainActivity"
android:exported="true"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<resources>
<string name="app_name">Soga</string>
<string name="app_name">Soga 🌟📚🗣️</string>
<string name="action_go">Go</string>
<string name="action_try">Try it</string>

<!-- Menu strings -->
<string name="menu_chat_title">Chat</string>
<string name="menu_chat_description">Chat with your AI tutor</string>
<string name="menu_chat_title">Chat with your AI tutor</string>
<string name="menu_chat_description"> “Unlocking Learning, One Chat at a Time!” 🌟📚🗣️</string>

<!-- Chat sample strings -->
<string name="chat_label">Message</string>
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ dependencyResolutionManagement {
}
}

rootProject.name = "soga"
rootProject.name = "Soga"
include(":app")

0 comments on commit df77ab9

Please sign in to comment.