Skip to content

feat: rebuild ConfigPrimaria with Material 3 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
git-jr merged 2 commits into from
Mar 30, 2026
Merged

feat: rebuild ConfigPrimaria with Material 3 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57acbd4
feat: rebuild ConfigPrimaria layout with Material 3
git-jr Mar 29, 2026
3de7185
refactor: update UI components to Material 3 and adjust theme setting…
git-jr Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<activity
android:name=".activity.ConfigPrimariaActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/Theme.AppCompat.Light.NoActionBar.Transparent"
android:theme="@style/Theme.Amadeus.ConfigPrimaria"
android:windowSoftInputMode="stateVisible|adjustResize|stateAlwaysHidden" />
<activity
android:name=".activity.SplashScreenActivity"
Expand Down Expand Up @@ -68,7 +68,7 @@
<activity
android:name=".activity.EditarItemEntidadeNovoActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/Theme.AppCompat.Light.NoActionBar.Transparent"
android:theme="@style/Theme.Amadeus.ConfigPrimaria"
android:windowSoftInputMode="stateVisible|adjustResize|stateAlwaysHidden" />
<activity
android:name=".activity.VozConfigActivity"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/paradoxo/amadeus/activity/ConfigPrimariaActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import android.net.Uri
import android.os.Bundle
import android.view.inputmethod.EditorInfo
import android.widget.TextView
import android.widget.ToggleButton
import com.google.android.material.materialswitch.MaterialSwitch
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.button.MaterialButton
import com.google.android.material.textfield.TextInputEditText
Expand All @@ -22,7 +22,7 @@ import com.paradoxo.amadeus.util.Util.configurarToolBarBranca
class ConfigPrimariaActivity : AppCompatActivity() {

private var primeiroUso = true
private lateinit var acessoDadosToggleButton: ToggleButton
private lateinit var acessoDadosToggleButton: MaterialSwitch
private lateinit var nomeUsuarioEditText: TextInputEditText
private lateinit var nomeIaEditText: TextInputEditText

Expand All @@ -47,7 +47,7 @@ class ConfigPrimariaActivity : AppCompatActivity() {
}

private fun configurarToggleButton() {
val modoFalaToggleButton = findViewById<ToggleButton>(R.id.modoFalaToggleButton)
val modoFalaToggleButton = findViewById<MaterialSwitch>(R.id.modoFalaToggleButton)
acessoDadosToggleButton = findViewById(R.id.acessoDadosToggleButton)

modoFalaToggleButton.isChecked = getPrefBool(PREF_VOZ_ATIVA, this, false)
Expand Down
298 changes: 165 additions & 133 deletions app/src/main/res/layout/activity_config_primaria.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,178 +1,210 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/configPrimariaLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="true"
tools:context=".activity.ConfigPrimariaActivity">

<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:fillViewport="true">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/text_margin"
android:gravity="center_horizontal"
android:orientation="vertical">

<TextView
android:id="@+id/tituloTexView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/projeto_amadeus"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />
android:orientation="vertical"
android:paddingStart="@dimen/text_margin"
android:paddingTop="48dp"
android:paddingEnd="@dimen/text_margin"
android:paddingBottom="32dp">

<!-- Header -->
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_gravity="center_horizontal"
android:contentDescription="@null"
android:scaleX="1.52"
android:scaleY="1.5"
android:src="@drawable/ic_launcher_foreground" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/text_margin"
android:layout_marginEnd="@dimen/text_margin"
android:gravity="center_horizontal"
android:orientation="vertical">

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/nomeUsuarioTextInput"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
<TextView
android:id="@+id/tituloTexView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="12dp"
android:text="@string/projeto_amadeus"
android:textAppearance="?attr/textAppearanceHeadlineMedium"
android:textColor="?attr/colorOnSurface" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
android:text="@string/configuracao_inicial"
android:textAppearance="?attr/textAppearanceBodyMedium"
android:textColor="?attr/colorOnSurfaceVariant" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/text_margin"
android:hint="@string/digite_seu_nome"
app:boxStrokeColor="@color/borda_card"
app:errorEnabled="true"
app:errorTextAppearance="@style/TextAppearance.App.Error.Personalizado"
app:hintTextAppearance="@style/TextAppearance.App.Hint.Personalizado">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/nomeUsuarioEditText"
android:layout_marginTop="32dp"
android:orientation="vertical"
android:padding="20dp">

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/nomeUsuarioTextInput"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/digite_seu_nome"
app:boxStrokeColor="@color/conteudo_card"
app:errorEnabled="true"
app:hintTextColor="@color/conteudo_card">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/nomeUsuarioEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionNext"
android:inputType="textCapWords"
android:maxLines="1" />

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/nomeIaTextInput"
style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:inputType="textCapWords"
android:imeOptions="actionNext"/>
android:layout_marginTop="4dp"
android:hint="@string/digite_um_nome_para_ia"
app:boxStrokeColor="@color/conteudo_card"
app:errorEnabled="true"
app:hintTextColor="@color/conteudo_card">

</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/nomeIaEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionGo"
android:inputType="textCapWords"
android:maxLines="1" />

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/nomeIaTextInput"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
</com.google.android.material.textfield.TextInputLayout>

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/digite_um_nome_para_ia"
android:layout_marginTop="@dimen/padding_bottom_card"
app:boxStrokeColor="@color/borda_card"
app:errorEnabled="true"
app:errorTextAppearance="@style/TextAppearance.App.Error.Personalizado"
app:hintTextAppearance="@style/TextAppearance.App.Hint.Personalizado">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/nomeIaEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:inputType="textCapWords"
android:imeOptions="actionGo"/>
android:layout_marginTop="8dp"
android:orientation="vertical"
android:padding="20dp">

</com.google.android.material.textfield.TextInputLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/configuracao_inicial"
android:textAppearance="?attr/textAppearanceTitleSmall"
android:textColor="@color/conteudo_card" />

</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="56dp"
android:orientation="horizontal">

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/modo_fala"
android:textAppearance="?attr/textAppearanceBodyLarge"
android:textColor="?attr/colorOnSurface" />

</LinearLayout>

<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/modoFalaToggleButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true" />

</LinearLayout>

<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="0dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_lista"
android:gravity="center"
android:text="@string/configuracao_inicial"
android:textColor="@android:color/black"
android:textSize="18sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="56dp"
android:orientation="horizontal">

<LinearLayout
android:layout_marginStart="@dimen/text_margin"
android:layout_marginEnd="@dimen/text_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="@dimen/text_margin"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="8"
android:text="@string/modo_fala"
android:textColor="@color/conteudo_card"
android:textSize="16sp"/>

<androidx.appcompat.widget.AppCompatToggleButton
android:id="@+id/modoFalaToggleButton"
android:checked="true"
android:textOn=""
android:textOff=""
android:background="@drawable/on_off"
android:layout_height="wrap_content"
android:layout_width="48dp">
</androidx.appcompat.widget.AppCompatToggleButton>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/permitir_uso_de_dados"
android:textAppearance="?attr/textAppearanceBodyLarge"
android:textColor="?attr/colorOnSurface" />

<LinearLayout
android:layout_marginStart="@dimen/text_margin"
android:layout_marginEnd="@dimen/text_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="horizontal">
</LinearLayout>

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="8"
android:text="@string/permitir_uso_de_dados"
android:textColor="@color/conteudo_card"
android:textSize="16sp"/>

<androidx.appcompat.widget.AppCompatToggleButton
android:id="@+id/acessoDadosToggleButton"
android:textOn=""
android:textOff=""
android:background="@drawable/on_off"
android:layout_height="wrap_content"
android:layout_width="48dp">
</androidx.appcompat.widget.AppCompatToggleButton>
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/acessoDadosToggleButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

</LinearLayout>

</LinearLayout>
</LinearLayout>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_icone_image"
android:layout_marginBottom="@dimen/item_lista"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/configs_podem_ser_alteradas_depois"
android:textColor="@color/gray_400"
android:textSize="14sp" />
android:textAppearance="?attr/textAppearanceBodySmall"
android:textColor="?attr/colorOnSurfaceVariant" />

<!-- Botão principal -->
<com.google.android.material.button.MaterialButton
android:id="@+id/okButton"
style="@style/BotaoOkay"
style="@style/Widget.Material3.Button"
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginStart="@dimen/text_margin"
android:layout_marginEnd="@dimen/text_margin"
android:gravity="center"
android:minWidth="300dp"
android:layout_height="56dp"
android:layout_marginTop="24dp"
android:text="@string/link_start"
android:textSize="18sp"
android:textStyle="bold"
android:theme="@style/BotaoOkay"
app:cornerRadius="10dp" />
android:textAppearance="?attr/textAppearanceButton"
app:backgroundTint="@color/colorPrimary"
app:cornerRadius="12dp" />

</LinearLayout>

</androidx.core.widget.NestedScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>
Loading