erros
This commit is contained in:
@@ -91,6 +91,7 @@ public class LoginActivity extends AppCompatActivity {
|
||||
loadingProgressBar = findViewById(R.id.loadingProgressBar);
|
||||
|
||||
FirebaseApp.initializeApp(this);
|
||||
firebaseAuth = FirebaseAuth.getInstance();
|
||||
mAuth = FirebaseAuth.getInstance();
|
||||
credentialManager = CredentialManager.create(getBaseContext());
|
||||
|
||||
@@ -344,5 +345,11 @@ public class LoginActivity extends AppCompatActivity {
|
||||
super.onStart();
|
||||
// Check if user is signed in (non-null) and update UI accordingly.
|
||||
FirebaseUser currentUser = mAuth.getCurrentUser();
|
||||
if (currentUser != null) {
|
||||
Intent intent = new Intent(LoginActivity.this, TelaInicialActivity.class);
|
||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
||||
startActivity(intent);
|
||||
finish();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@ public class AtivosFragment extends Fragment {
|
||||
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);
|
||||
View root = inflater.inflate(R.layout.fragment_ativos, container, false);
|
||||
|
||||
|
||||
return root;
|
||||
|
||||
@@ -26,7 +26,7 @@ public class DefinicoesFragment extends Fragment {
|
||||
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);
|
||||
View root = inflater.inflate(R.layout.fragment_definicoes, container, false);
|
||||
|
||||
|
||||
return root;
|
||||
|
||||
@@ -26,7 +26,7 @@ public class DocumentosFragment extends Fragment {
|
||||
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);
|
||||
View root = inflater.inflate(R.layout.fragment_documentos, container, false);
|
||||
|
||||
|
||||
return root;
|
||||
|
||||
@@ -25,7 +25,7 @@ public class GraficosFragment extends Fragment {
|
||||
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);
|
||||
View root = inflater.inflate(R.layout.fragment_graficos, container, false);
|
||||
|
||||
|
||||
return root;
|
||||
|
||||
@@ -25,7 +25,7 @@ public class MetasFragment extends Fragment {
|
||||
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);
|
||||
View root = inflater.inflate(R.layout.fragment_metas, container, false);
|
||||
|
||||
|
||||
return root;
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
android:backgroundTint="@color/preto"
|
||||
tools:context=".TelaInicialActivity">
|
||||
|
||||
<!-- <ScrollView-->
|
||||
<!-- android:layout_width="match_parent"-->
|
||||
<!-- android:layout_height="match_parent"-->
|
||||
<!-- android:background="@color/cinza">-->
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/cinza">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
@@ -412,12 +412,12 @@
|
||||
<androidx.fragment.app.FragmentContainerView
|
||||
android:id="@+id/fragmentContainerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="500dp"
|
||||
android:layout_height="900dp"
|
||||
android:layout_marginTop="16dp"
|
||||
app:layout_constraintTop_toBottomOf="@+id/barraCardView" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<!-- </ScrollView>-->
|
||||
</ScrollView>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/adicionarCardView"
|
||||
android:layout_width="376dp"
|
||||
android:layout_height="412dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginTop="624dp"
|
||||
android:background="@drawable/cardview_background"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
||||
Reference in New Issue
Block a user