Merge branch 'stringify' into 'master'
Extract strings See merge request pixeldroid/PixelDroid!247
This commit is contained in:
commit
62f4013d77
app/src/main
java/com/h/pixeldroid
res
@ -1,8 +1,8 @@
|
||||
package com.h.pixeldroid
|
||||
|
||||
import android.content.Intent
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import android.os.Bundle
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import kotlinx.android.synthetic.main.activity_about.*
|
||||
|
||||
class AboutActivity : AppCompatActivity() {
|
||||
@ -10,9 +10,9 @@ class AboutActivity : AppCompatActivity() {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_about)
|
||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||
supportActionBar?.title = "About PixelDroid"
|
||||
|
||||
supportActionBar?.setTitle(R.string.about_pixeldroid)
|
||||
|
||||
aboutVersionNumber.text = BuildConfig.VERSION_NAME
|
||||
licensesButton.setOnClickListener{
|
||||
val intent = Intent(this, LicenseActivity::class.java)
|
||||
startActivity(intent)
|
||||
|
@ -10,7 +10,7 @@ class LicenseActivity : AppCompatActivity() {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_licenses)
|
||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||
supportActionBar?.title = "Dependencies and licenses"
|
||||
webview.loadUrl("file:///android_asset/licenses.html");
|
||||
supportActionBar?.setTitle(R.string.dependencies_licenses)
|
||||
webview.loadUrl("file:///android_asset/licenses.html")
|
||||
}
|
||||
}
|
@ -1,2 +0,0 @@
|
||||
package com.h.pixeldroid.views
|
||||
|
@ -25,7 +25,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="11dp"
|
||||
android:text="PixelDroid"
|
||||
android:text="@string/app_name"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Large"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@ -36,11 +36,11 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="v1.0.alpha3"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/aboutAppName" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/aboutAppName"
|
||||
tools:text="v1.0.realversion" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/aboutAppDescription"
|
||||
@ -49,7 +49,7 @@
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:text="PixelDroid is free and open source software, licensed under the GNU General Public License (version 3 or later)"
|
||||
android:text="@string/license_info"
|
||||
android:textAlignment="center"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@ -61,7 +61,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:autoLink="web"
|
||||
android:text="Project website: https://pixeldroid.org"
|
||||
android:text="@string/project_website"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/aboutAppDescription" />
|
||||
@ -71,7 +71,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16dp"
|
||||
android:text="Dependencies and licenses"
|
||||
android:text="@string/dependencies_licenses"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/aboutWebsite" />
|
||||
|
@ -2,5 +2,4 @@
|
||||
<WebView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/webview"
|
||||
android:layout_width="match_parent" android:layout_height="match_parent">
|
||||
|
||||
</WebView>
|
@ -112,4 +112,9 @@
|
||||
<string name="posting_image_accessibility_hint">Image that is being posted</string>
|
||||
<string name="retry">Retry</string>
|
||||
<string name="nothing_to_see_here">Nothing to see here!</string>
|
||||
<string name="about_pixeldroid">About PixelDroid</string>
|
||||
<string name="dependencies_licenses">Dependencies and licenses</string>
|
||||
<string name="project_website">Project website: https://pixeldroid.org</string>
|
||||
<string name="license_info">PixelDroid is free and open source software, licensed under the GNU General Public License (version 3 or later)</string>
|
||||
<string name="about">About</string>
|
||||
</resources>
|
@ -11,7 +11,7 @@
|
||||
app:useSimpleSummaryProvider="true" />
|
||||
</PreferenceCategory>
|
||||
|
||||
<Preference android:title="About"
|
||||
<Preference android:title="@string/about"
|
||||
android:key="about"
|
||||
android:summary="About PixelDroid"/>
|
||||
android:summary="@string/about_pixeldroid"/>
|
||||
</PreferenceScreen>
|
||||
|
Loading…
x
Reference in New Issue
Block a user