Skip to content

Commit

Permalink
teams: smoother voices (fixes #4513) (#4514)
Browse files Browse the repository at this point in the history
Co-authored-by: dogi <[email protected]>
  • Loading branch information
Okuro3499 and dogi authored Oct 2, 2024
1 parent b32ae53 commit 977b783
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 14 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdkVersion 21
targetSdkVersion 34
versionCode 1979
versionName "0.19.79"
versionCode 1980
versionName "0.19.80"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ abstract class BaseRecyclerFragment<LI> : BaseRecyclerParentFragment<Any?>(), On
"courses" -> (v as TextView).setText(R.string.no_courses)
"resources" -> (v as TextView).setText(R.string.no_resources)
"finances" -> (v as TextView).setText(R.string.no_finance_record)
"news" -> (v as TextView).setText(R.string.no_stories)
"news" -> (v as TextView).setText(R.string.no_voices_available)
"teamCourses" -> (v as TextView).setText(R.string.no_team_courses)
"teamResources" -> (v as TextView).setText(R.string.no_team_resources)
"tasks" -> (v as TextView).setText(R.string.no_tasks)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import org.ole.planet.myplanet.ui.enterprises.FinanceFragment
import org.ole.planet.myplanet.ui.news.NewsFragment

class CommunityPagerAdapter(fm: FragmentActivity, private val id: String, private var fromLogin: Boolean) : FragmentStateAdapter(fm) {
private var titles = arrayOf(context.getString(R.string.news), context.getString(R.string.community_leaders), context.getString(R.string.calendar), context.getString(
private var titles = arrayOf(context.getString(R.string.our_voices), context.getString(R.string.community_leaders), context.getString(R.string.calendar), context.getString(
R.string.services), context.getString(R.string.finances))
private var titlesLogin = arrayOf(context.getString(R.string.news), context.getString(R.string.community_leaders), context.getString(R.string.calendar))
private var titlesLogin = arrayOf(context.getString(R.string.our_voices), context.getString(R.string.community_leaders), context.getString(R.string.calendar))
@RequiresApi(Build.VERSION_CODES.O)
override fun createFragment(position: Int): Fragment {
val fragment: Fragment = when (position) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,22 @@ class NewsFragment : BaseNewsFragment() {
user = UserProfileDbHandler(requireContext()).userModel
setupUI(fragmentNewsBinding.newsFragmentParentLayout, requireActivity())
if (user?.id?.startsWith("guest") == true) {
fragmentNewsBinding.btnAddStory.visibility = View.GONE
fragmentNewsBinding.btnNewVoice.visibility = View.GONE
}
fragmentNewsBinding.btnAddStory.setOnClickListener {
fragmentNewsBinding.btnNewVoice.setOnClickListener {
fragmentNewsBinding.llAddNews.visibility = if (fragmentNewsBinding.llAddNews.visibility == View.VISIBLE) {
View.GONE
} else {
View.VISIBLE
}
fragmentNewsBinding.btnAddStory.text = if (fragmentNewsBinding.llAddNews.visibility == View.VISIBLE) {
getString(R.string.hide_add_story)
fragmentNewsBinding.btnNewVoice.text = if (fragmentNewsBinding.llAddNews.visibility == View.VISIBLE) {
getString(R.string.hide_new_voice)
} else {
getString(R.string.add_story)
getString(R.string.new_voice)
}
}
if (requireArguments().getBoolean("fromLogin")) {
fragmentNewsBinding.btnAddStory.visibility = View.GONE
fragmentNewsBinding.btnNewVoice.visibility = View.GONE
fragmentNewsBinding.llAddNews.visibility = View.GONE
}

Expand Down Expand Up @@ -179,7 +179,7 @@ class NewsFragment : BaseNewsFragment() {
fragmentNewsBinding.rvNews.adapter = adapterNews
adapterNews?.let { showNoData(fragmentNewsBinding.tvMessage, it.itemCount, "news") }
fragmentNewsBinding.llAddNews.visibility = View.GONE
fragmentNewsBinding.btnAddStory.text = getString(R.string.add_story)
fragmentNewsBinding.btnNewVoice.text = getString(R.string.new_voice)
adapterNews?.notifyDataSetChanged()
}
}
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/layout/fragment_news.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
android:orientation="vertical">

<Button
android:id="@+id/btn_add_story"
android:id="@+id/btnNewVoice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/add_story" />
android:textAllCaps="false"
android:text="@string/new_voice" />
<LinearLayout
android:id="@+id/ll_add_news"
android:layout_width="match_parent"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,10 @@
<string name="copied_to_clipboard">تم نسخه إلى الحافظة</string>
<string name="mark_all_as_read">وضع علامة "مقروء" على الجميع</string>
<string name="mark_as_read">وضع علامة كمقروء</string>
<string name="our_voices">أصواتنا</string>
<string name="no_voices_available">لا توجد أصوات متاحة</string>
<string name="new_voice">صوت جديد</string>
<string name="hide_new_voice">إخفاء الصوت الجديد</string>
<string name="summary_of_achievemnets">ملخص الإنجازات - قم بتلخيص إنجازاتك بإيجاز وأضف المواد ذات الصلة أدناه</string>
<string name="my_goals">أهدافي - ما هي أهدافك للعشر سنوات القادمة؟</string>
<string name="add_materials">أضف أي مواد تُظهر إنجازاتك أدناه</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,10 @@
<string name="copied_to_clipboard">copiado al portapapeles</string>
<string name="mark_all_as_read">Marcar todo como leído</string>
<string name="mark_as_read">Marcar como leído</string>
<string name="our_voices">nuestras voces</string>
<string name="no_voices_available">no hay voces disponibles</string>
<string name="new_voice">nueva voz</string>
<string name="hide_new_voice">ocultar nueva voz</string>
<string name="summary_of_achievemnets">Resumen de logros - Resume brevemente tu logro y añade los materiales relacionados a continuación</string>
<string name="my_goals">Mis Metas - ¿Cuáles son tus metas para los próximos 10 años?</string>
<string name="add_materials">Agrega cualquier material que demuestre tus logros a continuación</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,10 @@
<string name="copied_to_clipboard">copié dans le presse-papiers</string>
<string name="mark_all_as_read">Marquer tout comme lu</string>
<string name="mark_as_read">Marquer comme lu</string>
<string name="our_voices">nos voix</string>
<string name="no_voices_available">aucune voix disponible</string>
<string name="new_voice">nouvelle voix</string>
<string name="hide_new_voice">cacher la nouvelle voix</string>
<string name="summary_of_achievemnets">Résumé des réalisations - Résumez brièvement votre réalisation et ajoutez les documents associés ci-dessous</string>
<string name="my_goals">Mes Objectifs - Quels sont vos objectifs pour les 10 prochaines années ?</string>
<string name="add_materials">Ajoutez tout matériel démontrant vos réalisations ci-dessous</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-ne/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,10 @@
<string name="copied_to_clipboard">क्लिपबोर्डमा प्रति लिइयो</string>
<string name="mark_all_as_read">सबैलाई पढिएको रूपमा चिन्ह लगाउनुहोस्</string>
<string name="mark_as_read">पढिएको रूपमा चिन्ह लगाउनुहोस्</string>
<string name="our_voices">हाम्रो आवाजहरू</string>
<string name="no_voices_available">उपलब्ध आवाजहरू छैनन्</string>
<string name="new_voice">नयाँ आवाज</string>
<string name="hide_new_voice">नयाँ आवाज लुकाउनुहोस्</string>
<string name="summary_of_achievemnets">उपलब्धिहरूको सारांश - आफ्नो उपलब्धि संक्षेपमा दिनुहोस् र सम्बन्धित सामग्री तल थप्नुहोस्</string>
<string name="my_goals">मेरा लक्ष्यहरू - आगामी १० वर्षका लागि तपाईँका लक्ष्यहरू के हुन्?</string>
<string name="add_materials">तपाईँका उपलब्धिहरू देखाउने कुनै पनि सामग्री तल थप्नुहोस्</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-so/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,10 @@
<string name="copied_to_clipboard">waxaa lagu koobay clipboard-ka</string>
<string name="mark_all_as_read">Calaamadee dhammaan sidii la aqriyay</string>
<string name="mark_as_read">Calaamadee sidii la aqriyay</string>
<string name="our_voices">codadkeena</string>
<string name="no_voices_available">ma jiro cod la heli karo</string>
<string name="new_voice">cod cusub</string>
<string name="hide_new_voice">qarso cod cusub</string>
<string name="summary_of_achievemnets">Dulmar guulo - Si kooban u soo koob guushaada oo hoos ku dar agabka la xiriira</string>
<string name="my_goals">Hadafyadayda - Waa maxay yoolalkaaga 10-ka sano ee soo socda?</string>
<string name="add_materials">Ku dar agabka kasta oo muujinaya guulahaaga hoos</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,10 @@
<string name="copied_to_clipboard">copied to clipboard</string>
<string name="mark_all_as_read">Mark all as read</string>
<string name="mark_as_read">Mark as read</string>
<string name="our_voices">our voices</string>
<string name="no_voices_available">no voices available</string>
<string name="new_voice">new voice</string>
<string name="hide_new_voice">hide new voice</string>
<string name="my_purpose">My Purpose - What are your educational and professional ambitions?</string>
<string name="my_goals">My Goals - What are your goals for the next 10 years?</string>
<string name="summary_of_achievemnets">Summary of achievements - Briefly summarize your achievement and add related materials below</string>
Expand Down

0 comments on commit 977b783

Please sign in to comment.