diff --git a/app/app.iml b/app/app.iml index 04c42a7..64da2d4 100644 --- a/app/app.iml +++ b/app/app.iml @@ -120,45 +120,45 @@ - - - - - - - - - - - - - - - - - - - - - + - - - - + - - + + + + - + + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f2f2544..431450f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ android { defaultConfig { applicationId "com.monitorabrasil.monitoramunicipio" - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 22 versionCode 4 versionName "0.4" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d78ce7c..4e1ff6b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -65,6 +65,18 @@ android:name="android.support.PARENT_ACTIVITY" android:value="com.monitorabrasil.monitoralegislativo.MainActivity" /> + + + + + diff --git a/app/src/main/ic_action_comment-web.png b/app/src/main/ic_action_comment-web.png new file mode 100644 index 0000000..449f2be Binary files /dev/null and b/app/src/main/ic_action_comment-web.png differ diff --git a/app/src/main/ic_action_like_gray-web.png b/app/src/main/ic_action_like_gray-web.png new file mode 100644 index 0000000..f9173a0 Binary files /dev/null and b/app/src/main/ic_action_like_gray-web.png differ diff --git a/app/src/main/ic_action_like_green-web.png b/app/src/main/ic_action_like_green-web.png new file mode 100644 index 0000000..0f54b6a Binary files /dev/null and b/app/src/main/ic_action_like_green-web.png differ diff --git a/app/src/main/ic_action_unlike_gray-web.png b/app/src/main/ic_action_unlike_gray-web.png new file mode 100644 index 0000000..9659e3d Binary files /dev/null and b/app/src/main/ic_action_unlike_gray-web.png differ diff --git a/app/src/main/ic_action_unlike_red-web.png b/app/src/main/ic_action_unlike_red-web.png new file mode 100644 index 0000000..c74f5b2 Binary files /dev/null and b/app/src/main/ic_action_unlike_red-web.png differ diff --git a/app/src/main/java/com/monitorabrasil/monitoralegislativo/ComentarioActivity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/ComentarioActivity.java new file mode 100644 index 0000000..6d3677f --- /dev/null +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/ComentarioActivity.java @@ -0,0 +1,39 @@ +package com.monitorabrasil.monitoralegislativo; + +import android.support.v7.app.ActionBarActivity; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; + +import com.monitorabrasil.monitoralegislativo.R; + +public class ComentarioActivity extends ActionBarActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_comentario); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.menu_comentario, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } +} diff --git a/app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticoFichaActivity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticoFichaActivity.java new file mode 100644 index 0000000..a19441f --- /dev/null +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticoFichaActivity.java @@ -0,0 +1,142 @@ +package com.monitorabrasil.monitoralegislativo; + +import android.content.res.Configuration; +import android.support.design.widget.CollapsingToolbarLayout; +import android.support.design.widget.CoordinatorLayout; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v4.app.FragmentTransaction; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; + +import com.monitorabrasil.monitoralegislativo.R; +import com.monitorabrasil.monitoralegislativo.fragments.GastosFragment; +import com.parse.ParseObject; +import com.parse.ParseQuery; + +public class PoliticoFichaActivity extends AppCompatActivity { + + Toolbar toolbar; + CollapsingToolbarLayout collapsingToolbarLayout; + + +// ActionBarDrawerToggle drawerToggle; + + CoordinatorLayout rootLayout; + FloatingActionButton fabBtn; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_politico_ficha); + + initToolbar(); + initInstances(); + + Bundle bundle = getIntent().getExtras(); + buscaPolitico(bundle.getString("politico")) ; + + buscaGrafico(); + + + + } + + private void buscaGrafico() { + GastosFragment gastos = new GastosFragment(); + gastos.setArguments(getIntent().getExtras()); + FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); + ft.add(R.id.rl_fragment_container, gastos, "politicoFrag"); + ft.commit(); + } + + private ParseObject buscaPolitico(String id) { + + ParseQuery query = ParseQuery.getQuery("Politico"); + query.fromLocalDatastore(); + try { + ParseObject politico = query.get(id); + collapsingToolbarLayout.setTitle(politico.get("nome").toString()); + } catch (com.parse.ParseException e) { + e.printStackTrace(); + } + return null; + } + + private void initToolbar() { + toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + } + + private void initInstances() { +// drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout); +// drawerToggle = new ActionBarDrawerToggle(PoliticoFichaActivity.this, drawerLayout, R.string.hello_world, R.string.hello_world); +// drawerLayout.setDrawerListener(drawerToggle); + + getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + rootLayout = (CoordinatorLayout) findViewById(R.id.rootLayout); + + fabBtn = (FloatingActionButton) findViewById(R.id.fabBtn); + fabBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Snackbar.make(rootLayout, "Hello. I am Snackbar!", Snackbar.LENGTH_SHORT) + .setAction("Undo", new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }) + .show(); + } + }); + + collapsingToolbarLayout = (CollapsingToolbarLayout) findViewById(R.id.collapsingToolbarLayout); + + } + + @Override + public void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); +// drawerToggle.syncState(); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); +// drawerToggle.onConfigurationChanged(newConfig); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.menu_main, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { +// if (drawerToggle.onOptionsItemSelected(item)) +// return true; + + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } +} diff --git a/app/src/main/java/com/monitorabrasil/monitoralegislativo/adapters/ProjetoAdapter.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/adapters/ProjetoAdapter.java index c836099..690f4bf 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/adapters/ProjetoAdapter.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/adapters/ProjetoAdapter.java @@ -1,6 +1,9 @@ package com.monitorabrasil.monitoralegislativo.adapters; +import android.content.Intent; +import android.graphics.drawable.Drawable; import android.support.design.widget.Snackbar; +import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; @@ -8,9 +11,12 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +import com.monitorabrasil.monitoralegislativo.ComentarioActivity; import com.monitorabrasil.monitoralegislativo.R; +import com.monitorabrasil.monitoralegislativo.application.MyApp; import com.monitorabrasil.monitoralegislativo.interfaces.RecyclerViewOnClickListenerHack; import com.parse.FindCallback; +import com.parse.GetCallback; import com.parse.ParseException; import com.parse.ParseObject; import com.parse.ParseQuery; @@ -37,16 +43,24 @@ public class ProjetoAdapter extends RecyclerView.Adapter query = ParseQuery.getQuery("Voto"); @@ -83,13 +108,18 @@ public class ProjetoAdapter extends RecyclerView.Adapter() { @Override public void done(List list, ParseException e) { - if(list.size() > 0){ + if (list.size() > 0) { String voto = list.get(0).get("voto").toString(); viewHolder.projetoVotado = list.get(0); - if(voto.equals("s")){ - viewHolder.btnConcordo.setText("Concordei"); - }else{ - viewHolder.btnDiscordo.setText("Discordei"); + if (voto.equals("s")) { + viewHolder.btnConcordo .setBackground(apoioVerde); + viewHolder.btnConcordo.setEnabled(false); + viewHolder.voto = "apoioado"; + ; + } else { + viewHolder.btnDiscordo.setBackground(napoioVermelho); + viewHolder.btnDiscordo.setEnabled(false); + viewHolder.voto = "nao_apoioado"; } } } @@ -99,6 +129,17 @@ public class ProjetoAdapter extends RecyclerView.Adapter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_politico_ficha.xml b/app/src/main/res/layout/activity_politico_ficha.xml new file mode 100644 index 0000000..082e420 --- /dev/null +++ b/app/src/main/res/layout/activity_politico_ficha.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_projeto.xml b/app/src/main/res/layout/item_projeto.xml index f6cd87a..5d2bc1f 100644 --- a/app/src/main/res/layout/item_projeto.xml +++ b/app/src/main/res/layout/item_projeto.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content"> -