Loading app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt +9 −4 Original line number Diff line number Diff line Loading @@ -9,8 +9,10 @@ package at.bitfire.davdroid.ui import android.app.Application import android.os.Build import android.os.Bundle import android.text.Spanned import android.util.DisplayMetrics import android.view.* import androidx.appcompat.app.AppCompatActivity import androidx.core.text.HtmlCompat Loading Loading @@ -72,18 +74,18 @@ class AboutActivity: AppCompatActivity() { override fun getPageTitle(position: Int): String = when (position) { 1 -> getString(R.string.about_libraries) else -> getString(R.string.app_name) 0 -> getString(R.string.app_name) else -> getString(R.string.about_libraries) } override fun getItem(position: Int) = when (position) { 1 -> LibsBuilder() 0 -> AppFragment() else -> LibsBuilder() .withAutoDetect(false) .withFields(R.string::class.java.fields) .withLicenseShown(true) .supportFragment() else -> AppFragment() }!! } Loading @@ -98,6 +100,9 @@ class AboutActivity: AppCompatActivity() { app_version.text = getString(R.string.about_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE) build_time.text = getString(R.string.about_build_date, SimpleDateFormat.getDateInstance().format(BuildConfig.buildTime)) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) icon.setImageDrawable(resources.getDrawableForDensity(R.mipmap.ic_launcher, DisplayMetrics.DENSITY_XXXHIGH)) pixels.text = HtmlCompat.fromHtml(pixelsHtml, HtmlCompat.FROM_HTML_MODE_LEGACY) if (true /* open-source version */) { Loading app/src/main/res/drawable-v26/ic_launcher_foreground.xml→app/src/main/res/drawable/ic_launcher_foreground.xml +0 −0 File moved. View file app/src/main/res/layout/about.xml +5 −2 Original line number Diff line number Diff line Loading @@ -11,6 +11,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_horizontal"> <LinearLayout Loading @@ -20,10 +21,12 @@ android:orientation="vertical" android:gravity="center_horizontal"> <ImageView <androidx.appcompat.widget.AppCompatImageView android:id="@+id/icon" android:layout_width="128dp" android:layout_height="128dp" android:src="@mipmap/ic_launcher" android:scaleType="fitXY" app:srcCompat="@drawable/ic_launcher_foreground" android:layout_marginBottom="16dp"/> <TextView Loading Loading
app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt +9 −4 Original line number Diff line number Diff line Loading @@ -9,8 +9,10 @@ package at.bitfire.davdroid.ui import android.app.Application import android.os.Build import android.os.Bundle import android.text.Spanned import android.util.DisplayMetrics import android.view.* import androidx.appcompat.app.AppCompatActivity import androidx.core.text.HtmlCompat Loading Loading @@ -72,18 +74,18 @@ class AboutActivity: AppCompatActivity() { override fun getPageTitle(position: Int): String = when (position) { 1 -> getString(R.string.about_libraries) else -> getString(R.string.app_name) 0 -> getString(R.string.app_name) else -> getString(R.string.about_libraries) } override fun getItem(position: Int) = when (position) { 1 -> LibsBuilder() 0 -> AppFragment() else -> LibsBuilder() .withAutoDetect(false) .withFields(R.string::class.java.fields) .withLicenseShown(true) .supportFragment() else -> AppFragment() }!! } Loading @@ -98,6 +100,9 @@ class AboutActivity: AppCompatActivity() { app_version.text = getString(R.string.about_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE) build_time.text = getString(R.string.about_build_date, SimpleDateFormat.getDateInstance().format(BuildConfig.buildTime)) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) icon.setImageDrawable(resources.getDrawableForDensity(R.mipmap.ic_launcher, DisplayMetrics.DENSITY_XXXHIGH)) pixels.text = HtmlCompat.fromHtml(pixelsHtml, HtmlCompat.FROM_HTML_MODE_LEGACY) if (true /* open-source version */) { Loading
app/src/main/res/drawable-v26/ic_launcher_foreground.xml→app/src/main/res/drawable/ic_launcher_foreground.xml +0 −0 File moved. View file
app/src/main/res/layout/about.xml +5 −2 Original line number Diff line number Diff line Loading @@ -11,6 +11,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" android:gravity="center_horizontal"> <LinearLayout Loading @@ -20,10 +21,12 @@ android:orientation="vertical" android:gravity="center_horizontal"> <ImageView <androidx.appcompat.widget.AppCompatImageView android:id="@+id/icon" android:layout_width="128dp" android:layout_height="128dp" android:src="@mipmap/ic_launcher" android:scaleType="fitXY" app:srcCompat="@drawable/ic_launcher_foreground" android:layout_marginBottom="16dp"/> <TextView Loading