Skip to content

Redesign #6

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

Draft
git-jr wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Redesign #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
beaf5ff
Fazendo pequenos ajustes ao layout para adequação ao Material Design
Sep 22, 2019
c998918
- Novo icone para o app;
Sep 26, 2019
8447fd0
- Remoção de arquivos desnecessários
Sep 26, 2019
04d352b
Lista de comandos adicionada dentro do app;
Sep 27, 2019
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
14 changes: 7 additions & 7 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "com.paradoxo.amadeus"
minSdkVersion 16
targetSdkVersion 28
versionCode 16
versionName "1.0.12"
versionCode 17
versionName "1.0.13"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
multiDexEnabled true
Expand Down Expand Up @@ -49,11 +49,11 @@ dependencies {
implementation 'com.google.android.material:material:1.0.0'


implementation 'com.google.firebase:firebase-core:17.0.1'
implementation 'com.google.firebase:firebase-auth:18.1.0'
implementation 'com.google.firebase:firebase-storage:18.1.1'
implementation 'com.google.firebase:firebase-database:18.0.1'
implementation 'com.google.firebase:firebase-messaging:19.0.1'
implementation 'com.google.firebase:firebase-core:17.2.0'
implementation 'com.google.firebase:firebase-auth:19.1.0'
implementation 'com.google.firebase:firebase-storage:19.1.0'
implementation 'com.google.firebase:firebase-database:19.1.0'
implementation 'com.google.firebase:firebase-messaging:20.0.0'

implementation 'com.google.android.gms:play-services-auth:17.0.0'
implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
Expand Down
73 changes: 49 additions & 24 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.paradoxo.amadeus">

<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<application
android:name="androidx.multidex.MultiDexApplication"
android:allowBackup="false"
Expand All @@ -21,43 +13,72 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">

<activity
android:name=".activity.VozSegundoPlanoActivity"
android:theme="@style/UI.Translucent" />

<activity android:name=".activity.TrocarVozActivity" />

<activity
android:name=".activity.MainActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<!-- <category android:name="android.intent.category.LAUNCHER" /> -->
</intent-filter>
</activity>

<activity
android:name=".nuvem.MeusBancosActivity"
android:theme="@style/AppTheme.NoActionBar" />

<activity
android:name=".nuvem.BancosOnlineActivity"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activity.ConfiguracoesActivity"
android:label="@string/title_activity_settings" />

<activity android:name=".activity.LoadActivity" />
<activity
android:name=".activity.LoadActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/Theme.AppCompat.Light.NoActionBar.Transparent"
android:windowSoftInputMode="stateVisible|adjustResize|stateAlwaysHidden" />
<activity
android:name=".activity.AlteraRespostasActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/Theme.AppCompat.Light.NoActionBar.Transparent"
android:windowSoftInputMode="stateVisible|adjustResize|stateAlwaysHidden" />
<activity android:name=".activity.SobreActivity" />
<activity android:name=".activity.QPythonActivity" />
<activity android:name=".activity.AlteraRespostasActivity" />
<activity android:name=".activity.ListarRespostasActivity" />
<activity
android:name=".activity.ListarRespostasActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/Theme.AppCompat.Light.NoActionBar.Transparent"
android:windowSoftInputMode="stateVisible|adjustResize|stateAlwaysHidden" />

<activity android:name=".activity.LicencaAnimacoesActivity" />
<activity android:name=".activity.VozSegundoPlanoConfiguracaoActivity" />

<activity
android:name=".activity.redesign.SplashScreenActivity"
android:theme="@style/Theme.AppCompat.Light.NoActionBar.Transparent">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>


<activity
android:name=".ListaComandosActivity"
android:theme="@style/Theme.AppCompat.Light.NoActionBar.Transparent" />

<meta-data
android:name="com.google.android.gms.ads.APPLICATION_ID"
android:value="ca-app-pub-9608651302719341~7979481150" />
<meta-data
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />

<service
android:name=".firebase.MessasingService"
android:permission="false">
Expand All @@ -70,16 +91,20 @@
android:exported="false"
android:permission="true">
<intent-filter>
<category android:name="android.intent.category.LAUNCHER" />

<action android:name="SERVICE_ESCUTADORA" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</service>
<service android:name=".service.TratarRespostaService" />

<meta-data
android:name="com.google.android.gms.ads.APPLICATION_ID"
android:value="ca-app-pub-9608651302719341~7979481150" />
</application>

<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERNET" />

</manifest>
Binary file modified app/src/main/ic_launcher-web.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions app/src/main/java/com/paradoxo/amadeus/ListaComandosActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.paradoxo.amadeus;

import androidx.appcompat.app.AppCompatActivity;

import android.os.Bundle;

import static com.paradoxo.amadeus.util.Util.configurarToolBarBranca;

public class ListaComandosActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_lista_comandos);
configurarToolBarBranca(this);
}
}
34 changes: 23 additions & 11 deletions app/src/main/java/com/paradoxo/amadeus/activity/AlteraRespostasActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@
import com.paradoxo.amadeus.adapter.AdapterMensagensBusca;
import com.paradoxo.amadeus.dao.AutorDAO;
import com.paradoxo.amadeus.dao.MensagemDAO;
import com.paradoxo.amadeus.modelo.Autor;
import com.paradoxo.amadeus.modelo.Mensagem;
import com.paradoxo.amadeus.util.Animacoes;

import java.util.List;

import static com.paradoxo.amadeus.util.Util.configurarToolBarBranca;

public class AlteraRespostasActivity extends AppCompatActivity {

private MensagemDAO mensagemDAO;
Expand All @@ -39,17 +42,19 @@ public class AlteraRespostasActivity extends AppCompatActivity {
private EditText editTextPergunta, editTextResposta;
private String respostaSelecionada, perguntaSelecionada;
private LinearLayout linearLayoutPergunta, linearLayoutResposta;
private boolean inserindo;


@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_respostas_alterar);

recuperarPerguntaActivityAnterior();

configurarToolBarBranca(this);
mensagemDAO = new MensagemDAO(this);

recuperarPerguntaActivityAnterior();

configurarRecylers();
iniciarlizarInterface();
}
Expand All @@ -59,6 +64,7 @@ private void recuperarPerguntaActivityAnterior() {
Intent intent = this.getIntent();
perguntaSelecionada = intent.getStringExtra("pergunta_selecionada");
respostaSelecionada = intent.getStringExtra("resposta_selecionada");
inserindo = intent.getBooleanExtra("inserindo",false);

if (respostaSelecionada != null) perguntaJaPossuiResposta = true;
} catch (Exception e) {
Expand Down Expand Up @@ -122,7 +128,6 @@ private void iniciarlizarInterface() {
editTextResposta.setText(respostaSelecionada);
editTextResposta.setSelection(respostaSelecionada.length());
editTextResposta.addTextChangedListener(detectarMudancaTextoResposta);

}

editTextPergunta.setOnEditorActionListener(new TextView.OnEditorActionListener() {
Expand Down Expand Up @@ -232,25 +237,32 @@ private void animarRecyclerResposta() {


public void atualizarResposta() {
// Fazer isso em asyncTask no futuro

String novaPergunta = String.valueOf(editTextPergunta.getText()).trim();
String novaResposta = String.valueOf(editTextResposta.getText()).trim();
String novaPergunta = String.valueOf(editTextPergunta.getText()).trim().toLowerCase();
String novaResposta = String.valueOf(editTextResposta.getText()).trim().toLowerCase();

if (!(novaPergunta.length() < 1 || novaResposta.length() < 1)) {
meuToast("Gravando resposta");

MensagemDAO msgDAO = new MensagemDAO(this);
mensagens = msgDAO.listarRespostasCompleto();
Mensagem objMsgPergunta = new Mensagem();
objMsgPergunta.setConteudo(perguntaSelecionada);
objMsgPergunta = (msgDAO.buscaPorConteudo(objMsgPergunta, !perguntaJaPossuiResposta));
objMsgPergunta.setConteudo(novaPergunta);

if (!novaPergunta.equals(perguntaSelecionada)) {
objMsgPergunta.setConteudo(novaPergunta);
msgDAO.alterar(objMsgPergunta);
if (inserindo) {
objMsgPergunta.setAutor(new Autor(1));
objMsgPergunta.setId((int) msgDAO.inserirMensagem(objMsgPergunta));
} else {
objMsgPergunta = (msgDAO.buscaPorConteudo(objMsgPergunta, !perguntaJaPossuiResposta));

if (!novaPergunta.equals(perguntaSelecionada) || inserindo) {
objMsgPergunta.setConteudo(novaPergunta);
msgDAO.alterar(objMsgPergunta);
}
}



if (!novaResposta.equals(respostaSelecionada)) {
Mensagem objMsgResposta = new Mensagem();
objMsgResposta.setConteudo(novaResposta);
Expand Down
Loading