Compare commits
2 Commits
055e132cfc
...
79322f3632
| Author | SHA1 | Date | |
|---|---|---|---|
| 79322f3632 | |||
| 5b3018afbb |
@@ -91,6 +91,7 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
loadingProgressBar = findViewById(R.id.loadingProgressBar);
|
loadingProgressBar = findViewById(R.id.loadingProgressBar);
|
||||||
|
|
||||||
FirebaseApp.initializeApp(this);
|
FirebaseApp.initializeApp(this);
|
||||||
|
firebaseAuth = FirebaseAuth.getInstance();
|
||||||
mAuth = FirebaseAuth.getInstance();
|
mAuth = FirebaseAuth.getInstance();
|
||||||
credentialManager = CredentialManager.create(getBaseContext());
|
credentialManager = CredentialManager.create(getBaseContext());
|
||||||
|
|
||||||
@@ -344,5 +345,11 @@ public class LoginActivity extends AppCompatActivity {
|
|||||||
super.onStart();
|
super.onStart();
|
||||||
// Check if user is signed in (non-null) and update UI accordingly.
|
// Check if user is signed in (non-null) and update UI accordingly.
|
||||||
FirebaseUser currentUser = mAuth.getCurrentUser();
|
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,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
// Inflate the layout for this fragment
|
// 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;
|
return root;
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public class DefinicoesFragment extends Fragment {
|
|||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
// Inflate the layout for this fragment
|
// 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;
|
return root;
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public class DocumentosFragment extends Fragment {
|
|||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
// Inflate the layout for this fragment
|
// 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;
|
return root;
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ public class GraficosFragment extends Fragment {
|
|||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
// Inflate the layout for this fragment
|
// 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;
|
return root;
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ public class MetasFragment extends Fragment {
|
|||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
// Inflate the layout for this fragment
|
// 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;
|
return root;
|
||||||
|
|||||||
@@ -8,10 +8,10 @@
|
|||||||
android:backgroundTint="@color/preto"
|
android:backgroundTint="@color/preto"
|
||||||
tools:context=".TelaInicialActivity">
|
tools:context=".TelaInicialActivity">
|
||||||
|
|
||||||
<!-- <ScrollView-->
|
<ScrollView
|
||||||
<!-- android:layout_width="match_parent"-->
|
android:layout_width="match_parent"
|
||||||
<!-- android:layout_height="match_parent"-->
|
android:layout_height="match_parent"
|
||||||
<!-- android:background="@color/cinza">-->
|
android:background="@color/cinza">
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -417,7 +417,7 @@
|
|||||||
app:layout_constraintTop_toBottomOf="@+id/barraCardView" />
|
app:layout_constraintTop_toBottomOf="@+id/barraCardView" />
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
<!-- </ScrollView>-->
|
</ScrollView>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/adicionarCardView"
|
android:id="@+id/adicionarCardView"
|
||||||
android:layout_width="376dp"
|
android:layout_width="376dp"
|
||||||
android:layout_height="412dp"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginTop="624dp"
|
android:layout_marginTop="624dp"
|
||||||
android:background="@drawable/cardview_background"
|
android:background="@drawable/cardview_background"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
|||||||
Reference in New Issue
Block a user