recloudstream
/
cloudstream
mirror of https://github.com/recloudstream/cloudstream.git
3
3
Fork 1
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Hosted Weblate 2024-03-25 00:59:59 +01:00
parent 6d8a31809d 35e38a53ad
commit 7f0034e872
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle.kts
View File

@ -70,9 +70,9 @@ android {
val localProperties = gradleLocalProperties(rootDir) val localProperties = gradleLocalProperties(rootDir)
buildConfigField( buildConfigField(
"String", "long",
"BUILDDATE", "BUILD_DATE",
"new java.text.SimpleDateFormat(\"yyyy-MM-dd HH:mm\").format(new java.util.Date(" + System.currentTimeMillis() + "L));" "${System.currentTimeMillis()}"
) )
buildConfigField( buildConfigField(
"String", "String",

17
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
View File

@ -30,6 +30,11 @@ import com.lagradost.cloudstream3.utils.UIHelper.navigate
import com.lagradost.cloudstream3.utils.UIHelper.setImage import com.lagradost.cloudstream3.utils.UIHelper.setImage
import com.lagradost.cloudstream3.utils.UIHelper.toPx import com.lagradost.cloudstream3.utils.UIHelper.toPx
import java.io.File import java.io.File
import java.text.DateFormat
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Locale
import java.util.TimeZone
class SettingsFragment : Fragment() { class SettingsFragment : Fragment() {
companion object { companion object {
@ -180,12 +185,14 @@ class SettingsFragment : Fragment() {
val appVersion = getString(R.string.app_version) val appVersion = getString(R.string.app_version)
val commitInfo = getString(R.string.commit_hash) val commitInfo = getString(R.string.commit_hash)
val buildDate = BuildConfig.BUILDDATE val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG,
Locale.getDefault()
).apply { timeZone = TimeZone.getTimeZone("UTC")
}.format(Date(BuildConfig.BUILD_DATE)).replace("UTC", "")
binding?.buildDate?.text = buildDate binding?.buildDate?.text = buildTimestamp
binding?.appVersionInfo?.setOnLongClickListener {
binding?.appVersionInfo?.setOnLongClickListener{ clipboardHelper(txt(R.string.extension_version), "$appVersion $commitInfo $buildTimestamp")
clipboardHelper(txt(R.string.extension_version), "$appVersion $commitInfo")
true true
} }
} }

13
app/src/main/res/layout/main_settings.xml
View File

@ -112,9 +112,9 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/version_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"
android:padding="10dp" android:padding="10dp"
android:text="@string/app_version" android:text="@string/app_version"
android:textColor="?attr/textColor" /> android:textColor="?attr/textColor" />
@ -123,8 +123,6 @@
android:id="@+id/delimiter0" android:id="@+id/delimiter0"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"
android:padding="10dp"
android:text="•" android:text="•"
android:textColor="?attr/textColor" /> android:textColor="?attr/textColor" />
@ -132,7 +130,6 @@
android:id="@+id/commit_hash" android:id="@+id/commit_hash"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"
android:padding="10dp" android:padding="10dp"
android:text="@string/commit_hash" android:text="@string/commit_hash"
android:textColor="?attr/textColor" /> android:textColor="?attr/textColor" />
@ -141,9 +138,6 @@
android:id="@+id/delimiter1" android:id="@+id/delimiter1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:padding="10dp"
android:text="•" android:text="•"
android:textColor="?attr/textColor" /> android:textColor="?attr/textColor" />
@ -151,10 +145,9 @@
android:id="@+id/build_date" android:id="@+id/build_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:padding="10dp" android:padding="10dp"
android:textColor="?attr/textColor" /> android:textColor="?attr/textColor"
tools:text="21/03/2024 09:02 pm"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>