Updated About and Translators menu

This commit is contained in:
Lucas Lima 2020-03-25 19:15:20 -03:00
parent 15a5c5165c
commit 02a65d9086
No known key found for this signature in database
GPG key ID: C828A958035D9C34
13 changed files with 74 additions and 47 deletions

View file

@ -14,10 +14,6 @@ class AboutViewModel : ViewModel() {
fun getTranslators() = TranslatorsAdapter(
listOf(
TranslationInfo(
"Brazilian Portuguese",
sequenceOf("Lucas Lima")
),
TranslationInfo(
"Czech",
sequenceOf("novas78@xda")
@ -26,9 +22,25 @@ class AboutViewModel : ViewModel() {
"French",
sequenceOf("Just Humeau")
),
TranslationInfo(
"German",
sequenceOf("Oswald Boelcke", "wlls_ftn")
),
TranslationInfo(
"Portuguese (BR)",
sequenceOf("Lucas Lima")
),
TranslationInfo(
"Spanish",
sequenceOf("Alfredo Jara")
),
TranslationInfo(
"Turkish",
sequenceOf("Fatih Fırıncı")
),
TranslationInfo(
"Vietnamese",
sequenceOf("pnhpnh")
)
)
)

View file

@ -10,7 +10,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import dev.lucasnlm.antimine.R
import dev.lucasnlm.antimine.about.viewmodel.AboutViewModel
import kotlinx.android.synthetic.main.activity_translators.*
import kotlinx.android.synthetic.main.fragment_translators.*
class TranslatorsFragment : Fragment() {
private var aboutViewModel: AboutViewModel? = null
@ -27,7 +27,7 @@ class TranslatorsFragment : Fragment() {
container: ViewGroup?,
savedInstanceState: Bundle?
): View? =
inflater.inflate(R.layout.activity_translators, container, false)
inflater.inflate(R.layout.fragment_translators, container, false)
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

View file

@ -4,5 +4,5 @@
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="dev.lucasnlm.antimine.about.AboutActivity"
android:fitsSystemWindows="true" />
android:fitsSystemWindows="true"
tools:context="dev.lucasnlm.antimine.about.AboutActivity" />

View file

@ -48,18 +48,18 @@
android:drawableStart="@drawable/timer"
android:drawableLeft="@drawable/timer"
android:drawablePadding="8dp"
android:drawableTint="?android:attr/textColorPrimary"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:visibility="gone"
android:minEms="2"
android:drawableTint="?android:attr/textColorPrimary"
android:text="@string/default_time_value"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size"
android:textStyle="bold"
android:text="@string/default_time_value"
tools:visibility="visible"
android:visibility="gone"
tools:targetApi="m"
tools:text="10:00"
tools:targetApi="m" />
tools:visibility="visible" />
<TextView
android:id="@+id/minesCount"
@ -69,17 +69,17 @@
android:drawableStart="@drawable/mine"
android:drawableLeft="@drawable/mine"
android:drawablePadding="8dp"
android:drawableTint="?android:attr/textColorPrimary"
android:gravity="center_vertical"
android:includeFontPadding="false"
android:minEms="3"
android:drawableTint="?android:attr/textColorPrimary"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size"
android:textStyle="bold"
android:visibility="gone"
tools:visibility="visible"
tools:targetApi="m"
tools:text="99"
tools:targetApi="m" />
tools:visibility="visible" />
</LinearLayout>
@ -93,15 +93,15 @@
android:id="@+id/install"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/install"
android:layout_margin="16dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_margin="16dp"
android:contentDescription="@string/install"
android:visibility="gone"
app:backgroundTint="@color/install_button"
app:pressedTranslationZ="6dp"
app:elevation="10dp"
app:pressedTranslationZ="6dp"
app:srcCompat="@drawable/install"
tools:visibility="visible"/>

View file

@ -19,9 +19,9 @@
<TextView
android:id="@+id/textView"
android:textColor="?android:attr/textColorPrimary"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:textColor="?android:attr/textColorPrimary" />
</FrameLayout>
</ScrollView>

View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -14,28 +13,43 @@
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:contentDescription="@string/app_name"
app:layout_constraintBottom_toTopOf="@+id/version"
app:layout_constraintBottom_toTopOf="@+id/version_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/title" />
<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/version_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:padding="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/buttons"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/logo"
tools:text="Anti-mine - Version 1.0" />
app:layout_constraintTop_toBottomOf="@+id/logo">
<TextView
android:id="@+id/app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold" />
<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary"
tools:text="Version 7.1.0" />
</LinearLayout>
<LinearLayout
android:id="@+id/buttons"
@ -45,7 +59,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/version">
app:layout_constraintTop_toBottomOf="@+id/version_layout">
<Button
android:id="@+id/thirdsParties"
@ -56,7 +70,7 @@
<Space
android:layout_width="match_parent"
android:layout_height="8dp"/>
android:layout_height="4dp" />
<Button
android:id="@+id/sourceCode"
@ -67,7 +81,7 @@
<Space
android:layout_width="match_parent"
android:layout_height="8dp"/>
android:layout_height="4dp" />
<Button
android:id="@+id/translation"

View file

@ -13,8 +13,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:textStyle="bold"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Third Name" />

View file

@ -15,19 +15,20 @@
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Language" />
<TextView
android:id="@+id/translators"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Person A\nPerson B" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -64,7 +64,7 @@
<string name="share_body_text">Dokončil jsem %1$d/%2$d za %3$d sekund.</string>
<string name="share_body_text_generic">Hraju %1$s</string>
<string name="fail_to_share">Sdílení hra se nezdařilo</string>
<string name="version_s">%1$s - %2$s</string>
<string name="version_s">Verze %1$s</string>
<string name="sound_effects">Zvukové efekty</string>
<string name="quit">Ukončit</string>
<string name="are_you_sure">Jste si jisti?</string>

View file

@ -64,7 +64,7 @@
<string name="share_body_text">Du hast %1$d/%2$d in %3$d Sekunden gemacht.</string>
<string name="share_body_text_generic">Ich spiele %1$s</string>
<string name="fail_to_share">Teilen des Spieles gescheitert</string>
<string name="version_s">%1$s-%2$s</string>
<string name="version_s">Version %1$s</string>
<string name="sound_effects">Sound-Effekte</string>
<string name="quit">Beenden</string>
<string name="are_you_sure">Bist du sicher?</string>

View file

@ -64,7 +64,7 @@
<string name="share_body_text">Tôi đã dò được %1$d/%2$d mìn trong vòng %3$d giây.</string>
<string name="share_body_text_generic">Tôi đang chơi %1$s</string>
<string name="fail_to_share">Không chia sẻ được trò chơi</string>
<string name="version_s">%1$s - %2$s</string>
<string name="version_s">Phiên bản %1$s</string>
<string name="sound_effects">Hiệu ứng âm thanh</string>
<string name="quit">Thoát</string>
<string name="are_you_sure">Bạn chắc chứ?</string>

View file

@ -64,7 +64,7 @@
<string name="share_body_text">I did %1$d/%2$d in %3$d seconds.</string>
<string name="share_body_text_generic">I\'m playing %1$s</string>
<string name="fail_to_share">Failed to share game</string>
<string name="version_s">%1$s - %2$s</string>
<string name="version_s">Version %1$s</string>
<string name="sound_effects">Sound Effects</string>
<string name="quit">Quit</string>
<string name="are_you_sure">Are you sure?</string>