diff --git a/app/build.gradle b/app/build.gradle index 2c93011..dbb7574 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,16 +26,6 @@ android { preDexLibraries true } - flavorDimensions "distro" - productFlavors { - fdroid { - dimension "distro" - } - github { - dimension "distro" - } - } - buildTypes { release { minifyEnabled true diff --git a/app/src/fdroid/java/tk/wasdennnoch/scoop/ui/AboutActivity.kt b/app/src/fdroid/java/tk/wasdennnoch/scoop/ui/AboutActivity.kt deleted file mode 100644 index f422a8f..0000000 --- a/app/src/fdroid/java/tk/wasdennnoch/scoop/ui/AboutActivity.kt +++ /dev/null @@ -1,44 +0,0 @@ -package tk.wasdennnoch.scoop.ui - -import android.content.pm.PackageManager -import android.os.Bundle -import android.view.MenuItem -import androidx.appcompat.app.AppCompatActivity -import androidx.core.content.pm.PackageInfoCompat -import tk.wasdennnoch.scoop.R -import tk.wasdennnoch.scoop.databinding.ActivityAboutBinding - -class AboutActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - val binding = ActivityAboutBinding.inflate(layoutInflater) - setContentView(binding.root) - setSupportActionBar(binding.aboutToolbar.toolbar) - supportActionBar?.setDisplayHomeAsUpEnabled(true) - - binding.aboutCredits.text = getString( - R.string.about_author, - "@MrWasdennnoch (XDA), @paphonb (XDA), @TacoTheDank (GitHub)" - ) - - try { - val pInfo = packageManager.getPackageInfo(packageName, 0) - binding.aboutVersion.text = String.format( - getString(R.string.about_version), - pInfo.versionName, - PackageInfoCompat.getLongVersionCode(pInfo) - ) - } catch (e: PackageManager.NameNotFoundException) { - // No. - } - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - if (item.itemId == android.R.id.home) { - finish() - return true - } - return super.onOptionsItemSelected(item) - } -} diff --git a/app/src/fdroid/res/layout/activity_about.xml b/app/src/fdroid/res/layout/activity_about.xml deleted file mode 100644 index f6b4c8d..0000000 --- a/app/src/fdroid/res/layout/activity_about.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include - android:id="@+id/about_toolbar" - layout="@layout/toolbar" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="?attr/actionBarSize" - android:baselineAligned="false" - android:gravity="center" - android:orientation="vertical"> - - <ImageView - android:layout_width="130dp" - android:layout_height="130dp" - android:layout_gravity="center" - android:contentDescription="@null" - app:srcCompat="@drawable/ic_launcher_big" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="12dp" - android:text="@string/app_name" - android:textColor="?android:textColorSecondary" - android:textSize="18sp" - android:textStyle="bold" /> - - <TextView - android:id="@+id/about_credits" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="12dp" - android:textAlignment="center" - android:textColor="?android:textColorTertiary" /> - - <TextView - android:id="@+id/about_version" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="6dp" - android:textAlignment="center" - android:textColor="?android:textColorTertiary" /> - - </LinearLayout> - -</FrameLayout> diff --git a/app/src/github/java/tk/wasdennnoch/scoop/ui/AboutActivity.kt b/app/src/main/java/tk/wasdennnoch/scoop/ui/AboutActivity.kt similarity index 93% rename from app/src/github/java/tk/wasdennnoch/scoop/ui/AboutActivity.kt rename to app/src/main/java/tk/wasdennnoch/scoop/ui/AboutActivity.kt index 9e23dd5..498964b 100644 --- a/app/src/github/java/tk/wasdennnoch/scoop/ui/AboutActivity.kt +++ b/app/src/main/java/tk/wasdennnoch/scoop/ui/AboutActivity.kt @@ -35,10 +35,10 @@ class AboutActivity : AppCompatActivity() { // No. } - binding.aboutUpdates.setOnClickListener { + binding.aboutGithub.setOnClickListener { val i = Intent( Intent.ACTION_VIEW, - "https://github.com/TacoTheDank/Scoop/releases".toUri() + "https://github.com/TacoTheDank/Scoop".toUri() ) startActivity(i) } diff --git a/app/src/github/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml similarity index 96% rename from app/src/github/res/layout/activity_about.xml rename to app/src/main/res/layout/activity_about.xml index 48d1372..7672f02 100644 --- a/app/src/github/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -52,13 +52,13 @@ android:textColor="?android:textColorTertiary" /> <androidx.appcompat.widget.AppCompatButton - android:id="@+id/about_updates" + android:id="@+id/about_github" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="16dp" android:background="@android:color/transparent" - android:text="@string/about_updates" + android:text="@string/about_github" android:textColor="@color/colorAccent" /> </LinearLayout> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7e9c786..a3b016c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -74,7 +74,7 @@ <!-- About screen --> <string name="about_author">Programmiert von %1$s</string> <string name="about_version">Version %1$s (%2$d)</string> - <string name="about_updates">Check for updates</string> + <string name="about_github">Source code</string> <!-- Notification channels --> <string name="crash_channel">Application crashes</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0aac403..62738fa 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -74,7 +74,7 @@ <!-- About screen --> <string name="about_author">Desenvolvido por %1$s</string> <string name="about_version">Versão %1$s (%2$d)</string> - <string name="about_updates">Check for updates</string> + <string name="about_github">Source code</string> <!-- Notification channels --> <string name="crash_channel">Application crashes</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8eb7a77..cdc7c3a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -74,7 +74,7 @@ <!-- About screen --> <string name="about_author">Developed by %1$s</string> <string name="about_version">Version %1$s (%2$d)</string> - <string name="about_updates">Check for updates</string> + <string name="about_github">Source code</string> <!-- Notification channels --> <string name="crash_channel">Application crashes</string>