filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sc' into unifiedpush

Browse Source 
Change-Id: I715e67cc1600706a6cfd7a2317df38909c74e11e
This commit is contained in:
SpiritCroc 2021-08-18 13:16:19 +02:00
commit 3b3e39bbb6
13 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fastlane/Fastfile
View File

@ -29,7 +29,7 @@ platform :android do
desc "Deploy a new version to the Google Play"
lane :deploy do
gradle(
task: "clean assembleGplayRelease",
task: "clean bundleGplayRelease",
properties: {
"android.injected.signing.store.file": keystore,
"android.injected.signing.store.password": keystore_pass,

6
fastlane/metadata/android/en-US/changelogs/40100620.txt Normal file
View File

@ -0,0 +1,6 @@
- Update codebase to Element v1.2.0
- Lab setting to load rooms at first unread message
- Hide empty/failed url preview image
- Properly theme verification request popup background
- Setting to disable voice message recording button
- Minor fixes and impovements

2
library/ui-styles/src/main/res/values/styles_alert_dialog.xml
View File

@ -7,6 +7,8 @@
<item name="buttonBarPositiveButtonStyle">@style/Widget.Vector.Button.TextButton.Dialog</item>
<item name="buttonBarNegativeButtonStyle">@style/Widget.Vector.Button.TextButton.Dialog</item>
<item name="buttonBarNeutralButtonStyle">@style/Widget.Vector.Button.TextButton.Dialog</item>
<item name="android:background">?colorBackgroundFloating</item>
</style>
<style name="ThemeOverlay.Vector.MaterialAlertDialog.Destructive">

10
vector/build.gradle
View File

@ -16,7 +16,7 @@ ext.versionMajor = 1
ext.versionMinor = 2
ext.versionPatch = 0
ext.scVersion = 39
ext.scVersion = 40
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
@ -122,10 +122,10 @@ android {
// `develop` branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode.
// Other branches (main, features, etc.) will have version code based on application version.
versionCode 40100590
versionCode 40100620
// Required for sonar analysis
versionName "1.1.14.sc39"
versionName "1.2.0.sc40"
buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
resValue "string", "git_revision", "\"${gitRevision()}\""
@ -264,7 +264,7 @@ android {
dimension "store"
isDefault = true
versionName "1.1.14.sc39"
versionName "1.2.0.sc40"
resValue "bool", "isGplay", "true"
buildConfigField "boolean", "ALLOW_FCM_USE", "true"
@ -275,7 +275,7 @@ android {
fdroid {
dimension "store"
versionName "1.1.14.sc39"
versionName "1.2.0.sc40"
resValue "bool", "isGplay", "false"
buildConfigField "boolean", "ALLOW_FCM_USE", "false"

2
vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
View File

@ -453,10 +453,12 @@ class HomeActivity :
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
/*
R.id.menu_home_suggestion -> {
bugReporter.openBugReportScreen(this, ReportType.SUGGESTION)
return true
}
*/
R.id.menu_home_report_bug -> {
bugReporter.openBugReportScreen(this, ReportType.BUG_REPORT)
return true

9
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
View File

@ -562,7 +562,7 @@ class RoomListFragment @Inject constructor(
}
private fun persistExpandStatus() {
val spEdit = getSharedPreferences().edit()
val spEdit = getSharedPreferences()?.edit() ?: return
roomListViewModel.sections.forEach{section ->
val isExpanded = section.isExpanded.value
if (isExpanded != null) {
@ -580,14 +580,13 @@ class RoomListFragment @Inject constructor(
}
private fun shouldInitiallyExpand(section: RoomsSection): Boolean {
val sp = getSharedPreferences()
val sp = getSharedPreferences() ?: return true
val pref = getRoomListExpandedPref(section)
return sp.getBoolean(pref, true)
}
private fun getSharedPreferences(): SharedPreferences {
return PreferenceManager.getDefaultSharedPreferences(context)
}
private fun getSharedPreferences() = context?.let { PreferenceManager.getDefaultSharedPreferences(it) }
private fun getRoomListExpandedPref(section: RoomsSection): String {
return "${ROOM_LIST_ROOM_EXPANDED_ANY_PREFIX}_${section.sectionName}_${roomListParams.displayMode}_${expandStatusSpaceId}"
}

2
vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
View File

@ -147,7 +147,7 @@ class ImageContentRenderer @Inject constructor(private val localFilesHelper: Loc
}
override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
if (resource != null && (data.width == null || data.height == null || data.width == 0 || data.height == 0)) {
if (resource != null /*&& (data.width == null || data.height == null || data.width == 0 || data.height == 0)*/) {
val updatedData = data.copy(width = resource.intrinsicWidth, height = resource.intrinsicHeight)
val newSize = processSize(updatedData, mode)
imageView.updateLayoutParams {

8
vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
View File

@ -71,14 +71,14 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
when (reportType) {
ReportType.BUG_REPORT -> {
supportActionBar?.setTitle(R.string.title_activity_bug_report)
views.bugReportButtonContactMe.isVisible = true
//views.bugReportButtonContactMe.isVisible = true
}
ReportType.SUGGESTION -> {
supportActionBar?.setTitle(R.string.send_suggestion)
views.bugReportFirstText.setText(R.string.send_suggestion_content)
views.bugReportTextInputLayout.hint = getString(R.string.send_suggestion_report_placeholder)
views.bugReportButtonContactMe.isVisible = true
//views.bugReportButtonContactMe.isVisible = true
hideBugReportOptions()
}
@ -87,7 +87,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
views.bugReportFirstText.setText(R.string.send_feedback_space_info)
views.bugReportTextInputLayout.hint = getString(R.string.feedback)
views.bugReportButtonContactMe.isVisible = true
//views.bugReportButtonContactMe.isVisible = true
hideBugReportOptions()
}
@ -162,7 +162,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
views.bugReportButtonIncludeScreenshot.isChecked,
views.bugReportEditText.text.toString(),
state.serverVersion,
views.bugReportButtonContactMe.isChecked,
false, //views.bugReportButtonContactMe.isChecked,
object : BugReporter.IMXBugReportListener {
override fun onUploadFailed(reason: String?) {
try {

15
vector/src/main/res/layout/activity_bug_report.xml
View File

@ -101,6 +101,19 @@
android:text="@string/send_bug_report_description_in_english"
android:textColor="?vctr_content_secondary" />
<TextView
android:id="@+id/bug_report_sc_extra"
style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:text="@string/send_bug_report_sc_extra"
android:linksClickable="true"
android:autoLink="web"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/bug_report_logs_description"
style="@style/Widget.Vector.TextView.Body"
@ -139,6 +152,7 @@
android:checked="false"
android:text="@string/send_bug_report_include_key_share_history" />
<!--
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/bug_report_button_contact_me"
android:layout_width="match_parent"
@ -147,6 +161,7 @@
android:layout_marginEnd="10dp"
android:checked="false"
android:text="@string/you_may_contact_me" />
-->
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/bug_report_button_include_screenshot"

5
vector/src/main/res/menu/home.xml
View File

@ -9,11 +9,12 @@
android:title="@string/settings"
app:showAsAction="never" />
<!--
<item
android:id="@+id/menu_home_suggestion"
android:icon="@drawable/ic_material_bug_report"
android:title="@string/send_suggestion"
android:visible="false" />
android:title="@string/send_suggestion" />
-->
<item
android:id="@+id/menu_home_report_bug"

2
vector/src/main/res/values-cs/strings_sc.xml
View File

@ -89,4 +89,6 @@
<string name="sc_accent_lava">Lávová</string>
<string name="sc_accent_blue">Modrá</string>
<string name="sc_accent_denim">Džínová</string>
<string name="settings_show_voice_message_recorder_ui">Hlasové zprávy</string>
<string name="settings_show_voice_message_recorder_ui_summary">Zobrazit tlačítko pro nahrávání hlasových zpráv</string>
</resources>

2
vector/src/main/res/values-ru/strings_sc.xml
View File

@ -88,4 +88,6 @@
<string name="sc_accent_blue">Синий</string>
<string name="settings_open_chats_at_first_unread">Открыть сначала непрочитанное</string>
<string name="settings_open_chats_at_first_unread_summary">Открывайте чаты на первом непрочитанном сообщении, а не внизу.</string>
<string name="settings_show_voice_message_recorder_ui">Голосовые сообщения</string>
<string name="settings_show_voice_message_recorder_ui_summary">Показать кнопку для записи голосовых сообщений</string>
</resources>

2
vector/src/main/res/values/strings_sc.xml
View File

@ -112,4 +112,6 @@
<string name="sc_accent_blue">Blue</string>
<!-- do not change this comment for accent generation -->
<string name="send_bug_report_sc_extra">To increase the visibility of your issue and to allow us to contact you, you may want to reference this report (by providing your matrix ID and the approximate time when it was sent) in an issue at https://github.com/SchildiChat/SchildiChat-android/issues (check first if one already exists for your issue, and only create a new one if there is not).</string>
</resources>