recloudstream/cloudstream
2
2
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into noupdate

Browse source 
merged and resolved conflict
This commit is contained in:
int3debug 2024-03-20 09:32:00 +01:00
commit ab6f7e746f
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
View file

@ -14,6 +14,7 @@ import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.appbar.MaterialToolbar
import com.lagradost.cloudstream3.BuildConfig
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.databinding.MainSettingsBinding
import com.lagradost.cloudstream3.mvvm.logError
@ -179,6 +180,9 @@ class SettingsFragment : Fragment() {
val appVersion = getString(R.string.app_version)
val commitInfo = getString(R.string.origin_hash)
val buildDate = BuildConfig.BUILDDATE
binding?.buildDate?.text = buildDate
binding?.appVersionInfo?.setOnLongClickListener{
clipboardHelper(txt(R.string.extension_version), "$appVersion $commitInfo")

21
app/src/main/res/layout/main_settings.xml
View file

@ -120,7 +120,7 @@
android:textColor="?attr/textColor" />
<TextView
android:id="@+id/textView3"
android:id="@+id/delimiter0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@ -136,6 +136,25 @@
android:padding="10dp"
android:text="@string/origin_hash"
android:textColor="?attr/textColor" />
<TextView
android:id="@+id/delimiter1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:padding="10dp"
android:text="•"
android:textColor="?attr/textColor" />
<TextView
android:id="@+id/build_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:padding="10dp"
android:textColor="?attr/textColor" />
</LinearLayout>
</LinearLayout>