diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 27e1876..e3cbbcf 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,8 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.google.gms.google.services) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) } android { @@ -30,6 +32,9 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } + buildFeatures { + compose = true + } } dependencies { @@ -45,7 +50,19 @@ dependencies { implementation(libs.firebase.database) implementation(libs.recyclerview) implementation(libs.cardview) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.material3.adaptive.navigation.suite) testImplementation(libs.junit) androidTestImplementation(libs.ext.junit) androidTestImplementation(libs.espresso.core) + androidTestImplementation(platform(libs.compose.bom)) + androidTestImplementation(libs.ui.test.junit4) + debugImplementation(libs.ui.tooling) + debugImplementation(libs.ui.test.manifest) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5a2581e..dcfb5f0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,17 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.LifeGrid"> + + + + + + + diff --git a/app/src/main/java/com/example/lifegrid/TelaInicialActivity.java b/app/src/main/java/com/example/lifegrid/TelaInicialActivity.java index 863b7b2..cabf3aa 100644 --- a/app/src/main/java/com/example/lifegrid/TelaInicialActivity.java +++ b/app/src/main/java/com/example/lifegrid/TelaInicialActivity.java @@ -1,15 +1,28 @@ package com.example.lifegrid; import android.os.Bundle; +import android.widget.TextView; import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; +import androidx.fragment.app.Fragment; + +import com.example.lifegrid.menu.TransacoesFragment; public class TelaInicialActivity extends AppCompatActivity { + private TextView tvValor; + private TextView tvTransacoes; + private TextView tvValor2; + private TextView tvTransacoes2; + private TextView tvValor3; + private TextView tvTransacoes3; + private TextView tvValor4; + private TextView tvTransacoes4; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -20,5 +33,10 @@ public class TelaInicialActivity extends AppCompatActivity { v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); return insets; }); + + Fragment fragment = new TransacoesFragment(); + getSupportFragmentManager().beginTransaction() + .add(R.id.fragmentContainerView, fragment) + .commit(); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/lifegrid/menu/TransacoesFragment.java b/app/src/main/java/com/example/lifegrid/menu/TransacoesFragment.java new file mode 100644 index 0000000..f2f96a4 --- /dev/null +++ b/app/src/main/java/com/example/lifegrid/menu/TransacoesFragment.java @@ -0,0 +1,38 @@ +package com.example.lifegrid.menu; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.example.lifegrid.R; + + +public class TransacoesFragment extends Fragment { + + + + public TransacoesFragment() { + // Required empty public constructor + } + + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + View root = inflater.inflate(R.layout.fragment_transacoes, container, false); + + + return root; + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/otherbuttons.xml b/app/src/main/res/drawable/otherbuttons.xml new file mode 100644 index 0000000..2590f7e --- /dev/null +++ b/app/src/main/res/drawable/otherbuttons.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_tela_inicial.xml b/app/src/main/res/layout/activity_tela_inicial.xml index b391d43..c6f6e88 100644 --- a/app/src/main/res/layout/activity_tela_inicial.xml +++ b/app/src/main/res/layout/activity_tela_inicial.xml @@ -328,14 +328,14 @@ - @@ -343,14 +343,70 @@ android:id="@+id/imageView" android:layout_width="20dp" android:layout_height="20dp" - app:srcCompat="@drawable/alvo" /> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/alvo" + tools:layout_editor_absoluteX="235dp" /> - + + + + + + + + + + + + diff --git a/app/src/main/res/layout/ativos.xml b/app/src/main/res/layout/ativos.xml index 77d9ef6..925be59 100644 --- a/app/src/main/res/layout/ativos.xml +++ b/app/src/main/res/layout/ativos.xml @@ -1,6 +1,158 @@ + + + + +