From cc689fce67319d5caa7a9fc2c5b7eaebabbbc6b2 Mon Sep 17 00:00:00 2001 From: geraugu Date: Fri, 31 Jul 2015 00:46:08 -0300 Subject: [PATCH] mudanca de cores correcao de bugs logo inserida tela sobre implementada --- app/app.iml | 12 ++++++------ app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 8 ++++++++ app/src/main/ic_action_share-web.png | Bin 0 -> 5900 bytes app/src/main/ic_launcher-web.png | Bin 0 -> 41432 bytes app/src/main/java/com/monitorabrasil/monitoralegislativo/CamaraActivity.java | 4 +--- app/src/main/java/com/monitorabrasil/monitoralegislativo/ComentarioActivity.java | 3 --- app/src/main/java/com/monitorabrasil/monitoralegislativo/LoginActivity.java | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------- app/src/main/java/com/monitorabrasil/monitoralegislativo/MainActivity.java | 9 +++++++-- app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticoFichaActivity.java | 4 +--- app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticosActivity.java | 4 +--- app/src/main/java/com/monitorabrasil/monitoralegislativo/ProjetosActivity.java | 4 +--- app/src/main/java/com/monitorabrasil/monitoralegislativo/SobreActivity.java | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/java/com/monitorabrasil/monitoralegislativo/adapters/ProjetoAdapter.java | 6 ++++-- app/src/main/java/com/monitorabrasil/monitoralegislativo/fragments/HomeFragment.java | 17 +++++++++++++++++ app/src/main/java/com/monitorabrasil/monitoralegislativo/fragments/ListaProjetosFragment.java | 6 ++++++ app/src/main/java/com/monitorabrasil/monitoralegislativo/fragments/PoliticoFichaFragment.java | 6 ++++-- app/src/main/java/com/monitorabrasil/monitoralegislativo/util/MyValueFormatter.java | 3 ++- app/src/main/res/drawable-hdpi/ic_action_person.png | Bin 0 -> 575 bytes app/src/main/res/drawable-mdpi/ic_action_person.png | Bin 0 -> 411 bytes app/src/main/res/drawable-xhdpi/ic_action_person.png | Bin 0 -> 760 bytes app/src/main/res/drawable-xxhdpi/ic_action_person.png | Bin 0 -> 1134 bytes app/src/main/res/layout/activity_login.xml | 8 ++++++++ app/src/main/res/layout/activity_sobre.xml | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ app/src/main/res/layout/fragment_home.xml | 7 +++++++ app/src/main/res/menu/menu_main.xml | 2 +- app/src/main/res/menu/menu_sobre.xml | 6 ++++++ app/src/main/res/mipmap-hdpi/ic_action_share.png | Bin 0 -> 1309 bytes app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3418 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_action_share.png | Bin 0 -> 731 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2206 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_action_share.png | Bin 0 -> 1943 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 0 bytes app/src/main/res/mipmap-xxhdpi/ic_action_share.png | Bin 0 -> 3041 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/ic_action_share.png | Bin 0 -> 3563 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 8849 bytes app/src/main/res/values/colors.xml | 14 +++++++++----- app/src/main/res/values/strings.xml | 6 +++++- 39 files changed, 306 insertions(+), 144 deletions(-) create mode 100644 app/src/main/ic_action_share-web.png create mode 100644 app/src/main/ic_launcher-web.png create mode 100644 app/src/main/java/com/monitorabrasil/monitoralegislativo/SobreActivity.java create mode 100644 app/src/main/res/drawable-hdpi/ic_action_person.png create mode 100644 app/src/main/res/drawable-mdpi/ic_action_person.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_person.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_person.png create mode 100644 app/src/main/res/layout/activity_sobre.xml create mode 100644 app/src/main/res/menu/menu_sobre.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_action_share.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_action_share.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_action_share.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_action_share.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_action_share.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/app.iml b/app/app.iml index 04c42a7..8c99554 100644 --- a/app/app.iml +++ b/app/app.iml @@ -75,10 +75,10 @@ - + - + @@ -102,7 +102,7 @@ - + @@ -142,23 +142,23 @@ - + - + - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d374379..ddf34ac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { applicationId "com.monitorabrasil.monitoramunicipio" minSdkVersion 16 targetSdkVersion 22 - versionCode 10 - versionName "0.8.2" + versionCode 11 + versionName "0.9.0" } buildTypes { release { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4e1ff6b..f597611 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -77,6 +77,14 @@ android:name=".ComentarioActivity" android:label="@string/title_activity_comentario" > + + + diff --git a/app/src/main/ic_action_share-web.png b/app/src/main/ic_action_share-web.png new file mode 100644 index 0000000..88af07b Binary files /dev/null and b/app/src/main/ic_action_share-web.png differ diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000..ab5397c Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/com/monitorabrasil/monitoralegislativo/CamaraActivity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/CamaraActivity.java index 566ce62..8825e61 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/CamaraActivity.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/CamaraActivity.java @@ -59,9 +59,7 @@ public class CamaraActivity extends AppCompatActivity { 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/ComentarioActivity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/ComentarioActivity.java index 820ff2f..8317245 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/ComentarioActivity.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/ComentarioActivity.java @@ -223,9 +223,6 @@ public class ComentarioActivity extends AppCompatActivity { 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/LoginActivity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/LoginActivity.java index 728a23d..2458fe6 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/LoginActivity.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/LoginActivity.java @@ -11,6 +11,7 @@ import android.content.Intent; import android.content.Loader; import android.database.Cursor; import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.net.Uri; import android.os.AsyncTask; @@ -30,10 +31,13 @@ import android.widget.ArrayAdapter; import android.widget.AutoCompleteTextView; import android.widget.Button; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import java.io.FileNotFoundException; +import java.io.InputStream; import java.text.ParseException; import java.util.ArrayList; import java.util.List; @@ -54,7 +58,7 @@ import org.w3c.dom.Text; /** * A login screen that offers login via email/password. */ -public class LoginActivity extends AppCompatActivity implements LoaderCallbacks { +public class LoginActivity extends AppCompatActivity { /** @@ -77,6 +81,9 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< private TextView lblEmail; private ImageView foto; private ParseUser currentUser; + private ImageButton btnFoto; + + private final int PICK_IMAGE=2; @Override protected void onCreate(Bundle savedInstanceState) { @@ -85,23 +92,39 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< setupActionBar(); mLoginFormView = findViewById(R.id.login_form); mLogoutFormView = findViewById(R.id.logout_form); + mProgressView = findViewById(R.id.login_progress); + btnFoto = (ImageButton) findViewById(R.id.btnFoto); currentUser = ParseUser.getCurrentUser(); + + if (currentUser != null) { montaFormLogout(); }else{ - mLogoutFormView.setVisibility(View.GONE); mLoginFormView.setVisibility(View.VISIBLE); } + // Set up the login form. + btnFoto.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + Intent getIntent = new Intent(Intent.ACTION_GET_CONTENT); + getIntent.setType("image/*"); + Intent pickIntent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI); + pickIntent.setType("image/*"); + Intent chooserIntent = Intent.createChooser(getIntent, "Selecione uma foto"); + chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] {pickIntent}); + + startActivityForResult(chooserIntent, PICK_IMAGE); + } + }); - // Set up the login form. mNome = (EditText)findViewById(R.id.txtNome); mNome.setVisibility(View.GONE); @@ -112,13 +135,11 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< @Override public void onClick(View v) { - showProgress(true); + showProgress(true,null); ParseUser.logOutInBackground(new LogOutCallback() { @Override public void done(com.parse.ParseException e) { - mLogoutFormView.setVisibility(View.GONE); - mLoginFormView.setVisibility(View.VISIBLE); - showProgress(false); + showProgress(false, mLoginFormView); } }); } @@ -153,6 +174,8 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< Snackbar.make(mLoginFormView, "Login cancelado ", Snackbar.LENGTH_LONG) .setAction("Action", null).show(); } else if (parseUser.isNew()) { + parseUser.put("nome",ParseTwitterUtils.getTwitter().getScreenName()); + parseUser.saveInBackground(); montaFormLogout(); } else { montaFormLogout(); @@ -163,7 +186,7 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< }); mEmailView = (AutoCompleteTextView) findViewById(R.id.email); - populateAutoComplete(); + mPasswordView = (EditText) findViewById(R.id.password); mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() { @@ -186,7 +209,38 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< }); - mProgressView = findViewById(R.id.login_progress); + + } + + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == PICK_IMAGE && resultCode == Activity.RESULT_OK) { + if (data == null) { + //Display an error + return; + } + try { + Uri selectedImage = data.getData(); + InputStream imageStream = getContentResolver().openInputStream(selectedImage); + Bitmap yourSelectedImage = BitmapFactory.decodeStream(imageStream); + btnFoto.setImageBitmap(yourSelectedImage); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + //Now you can do whatever you want with your inpustream, save it as file, upload to a server, decode a bitmap... + } + } + + private void showProgress(boolean b,View v) { + if(b){ + mProgressView.setVisibility(View.VISIBLE); + mLogoutFormView.setVisibility(View.GONE); + mLoginFormView.setVisibility(View.GONE); + }else{ + mProgressView.setVisibility(View.GONE); + v.setVisibility(View.VISIBLE); + } } private void montaFormLogout() { @@ -194,10 +248,10 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< lblEmail = (TextView)findViewById(R.id.lblEmail); foto = (ImageView)findViewById(R.id.foto); - mLogoutFormView.setVisibility(View.VISIBLE); mLoginFormView.setVisibility(View.GONE); + showProgress(false,mLogoutFormView); - if(ParseTwitterUtils.getTwitter()!=null){ + if(ParseTwitterUtils.getTwitter().getUserId() !=null){ String screenName = ParseTwitterUtils.getTwitter().getScreenName(); lblNome.setText(screenName); lblEmail.setText(""); @@ -216,7 +270,7 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< @Override public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) { - foto.setImageBitmap(loadedImage); + foto.setImageBitmap(loadedImage); } @Override @@ -279,7 +333,7 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< } else { // Show a progress spinner, and kick off a background task to // perform the user login attempt. - showProgress(true); + showProgress(true,null); ParseUser user = new ParseUser(); user.setUsername(email); @@ -292,11 +346,11 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< @Override public void done(com.parse.ParseException e) { if (e == null) { - showProgress(false); montaFormLogout(); } else { - showProgress(false); - + showProgress(false,mLoginFormView); + Snackbar.make(mLoginFormView, "Houve um erro ao fazer seu cadastro ", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); } } @@ -306,9 +360,7 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< } } - private void populateAutoComplete() { - getLoaderManager().initLoader(0, null, this); - } + /** * Set up the {@link android.app.ActionBar}, if the API is available. @@ -370,7 +422,7 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< } else { // Show a progress spinner, and kick off a background task to // perform the user login attempt. - showProgress(true); + showProgress(true,null); //fazer o login aqui fazerLogin(email, password); @@ -388,7 +440,7 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< } else { mPasswordView.setError(getString(R.string.error_incorrect_password)); mPasswordView.requestFocus(); - showProgress(false); + showProgress(false,mLoginFormView); } } @@ -406,94 +458,8 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks< return password.length() > 4; } - /** - * Shows the progress UI and hides the login form. - */ - @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2) - public void showProgress(final boolean show) { - // On Honeycomb MR2 we have the ViewPropertyAnimator APIs, which allow - // for very easy animations. If available, use these APIs to fade-in - // the progress spinner. - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) { - int shortAnimTime = getResources().getInteger(android.R.integer.config_shortAnimTime); - - mLoginFormView.setVisibility(show ? View.GONE : View.VISIBLE); - mLoginFormView.animate().setDuration(shortAnimTime).alpha( - show ? 0 : 1).setListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mLoginFormView.setVisibility(show ? View.GONE : View.VISIBLE); - } - }); - mLogoutFormView.setVisibility(show ? View.GONE : View.VISIBLE); - mLogoutFormView.animate().setDuration(shortAnimTime).alpha( - show ? 0 : 1).setListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mLogoutFormView.setVisibility(show ? View.GONE : View.VISIBLE); - } - }); - - mProgressView.setVisibility(show ? View.VISIBLE : View.GONE); - mProgressView.animate().setDuration(shortAnimTime).alpha( - show ? 1 : 0).setListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - mProgressView.setVisibility(show ? View.VISIBLE : View.GONE); - } - }); - } else { - // The ViewPropertyAnimator APIs are not available, so simply show - // and hide the relevant UI components. - mProgressView.setVisibility(show ? View.VISIBLE : View.GONE); - mLoginFormView.setVisibility(show ? View.GONE : View.VISIBLE); - mLogoutFormView.setVisibility(show ? View.GONE : View.VISIBLE); - } - } - - @Override - public Loader onCreateLoader(int i, Bundle bundle) { - return new CursorLoader(this, - // Retrieve data rows for the device user's 'profile' contact. - Uri.withAppendedPath(ContactsContract.Profile.CONTENT_URI, - ContactsContract.Contacts.Data.CONTENT_DIRECTORY), ProfileQuery.PROJECTION, - - // Select only email addresses. - ContactsContract.Contacts.Data.MIMETYPE + - " = ?", new String[]{ContactsContract.CommonDataKinds.Email - .CONTENT_ITEM_TYPE}, - - // Show primary email addresses first. Note that there won't be - // a primary email address if the user hasn't specified one. - ContactsContract.Contacts.Data.IS_PRIMARY + " DESC"); - } - - @Override - public void onLoadFinished(Loader cursorLoader, Cursor cursor) { - List emails = new ArrayList(); - cursor.moveToFirst(); - while (!cursor.isAfterLast()) { - emails.add(cursor.getString(ProfileQuery.ADDRESS)); - cursor.moveToNext(); - } - addEmailsToAutoComplete(emails); - } - - @Override - public void onLoaderReset(Loader cursorLoader) { - } - - private interface ProfileQuery { - String[] PROJECTION = { - ContactsContract.CommonDataKinds.Email.ADDRESS, - ContactsContract.CommonDataKinds.Email.IS_PRIMARY, - }; - - int ADDRESS = 0; - int IS_PRIMARY = 1; - } private void addEmailsToAutoComplete(List emailAddressCollection) { diff --git a/app/src/main/java/com/monitorabrasil/monitoralegislativo/MainActivity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/MainActivity.java index f292ad1..aa479b2 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/MainActivity.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/MainActivity.java @@ -179,7 +179,8 @@ public class MainActivity extends AppCompatActivity implements HomeFragment.OnFr new DividerDrawerItem(), new PrimaryDrawerItem().withName("Vereadores"), new SecondaryDrawerItem().withName("Indicações"), - new SecondaryDrawerItem().withName("Câmara") + new SecondaryDrawerItem().withName("Câmara"), + new SecondaryDrawerItem().withName("Sobre") ) .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() { @Override @@ -207,6 +208,9 @@ public class MainActivity extends AppCompatActivity implements HomeFragment.OnFr case 4: startActivity(new Intent(getApplicationContext(), CamaraActivity.class)); break; + case 5: + startActivity(new Intent(getApplicationContext(), SobreActivity.class)); + break; } navigationDrawerLeft.closeDrawer(); @@ -237,7 +241,8 @@ public class MainActivity extends AppCompatActivity implements HomeFragment.OnFr int id = item.getItemId(); //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { + if (id == R.id.action_sobre) { + startActivity(new Intent(getApplicationContext(),SobreActivity.class)); return true; } diff --git a/app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticoFichaActivity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticoFichaActivity.java index 992134c..5ad5b99 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticoFichaActivity.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticoFichaActivity.java @@ -176,9 +176,7 @@ public class PoliticoFichaActivity extends AppCompatActivity { 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/PoliticosActivity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticosActivity.java index 4ca1088..2bd8707 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticosActivity.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/PoliticosActivity.java @@ -62,9 +62,7 @@ public class PoliticosActivity extends AppCompatActivity { 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/ProjetosActivity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/ProjetosActivity.java index 56f6535..2399b0a 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/ProjetosActivity.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/ProjetosActivity.java @@ -70,9 +70,7 @@ public class ProjetosActivity extends ActionBarActivity { 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/SobreActivity.java b/app/src/main/java/com/monitorabrasil/monitoralegislativo/SobreActivity.java new file mode 100644 index 0000000..5758cfc --- /dev/null +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/SobreActivity.java @@ -0,0 +1,71 @@ +package com.monitorabrasil.monitoralegislativo; + +import android.content.pm.PackageManager; +import android.support.v7.app.ActionBarActivity; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.text.Html; +import android.text.method.LinkMovementMethod; +import android.view.Menu; +import android.view.MenuItem; +import android.widget.TextView; + +import com.crashlytics.android.answers.Answers; +import com.crashlytics.android.answers.ContentViewEvent; +import com.monitorabrasil.monitoralegislativo.R; + +import org.w3c.dom.Text; + +public class SobreActivity extends AppCompatActivity { + + Toolbar toolbar; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_sobre); + initToolbar(); + toolbar.setTitle("Sobre"); + setSupportActionBar(toolbar); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + + + TextView versao = (TextView)findViewById(R.id.versao); + try { + versao.setText("Versão: "+getPackageManager().getPackageInfo(getPackageName(), 0).versionName); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + + Answers.getInstance().logContentView(new ContentViewEvent() + .putContentName("SobreActivity") + .putContentType("Activity")); + } + + private void initToolbar() { + toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + } + + @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_sobre, 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 + + + 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 5831ac7..26f73d9 100644 --- a/app/src/main/java/com/monitorabrasil/monitoralegislativo/adapters/ProjetoAdapter.java +++ b/app/src/main/java/com/monitorabrasil/monitoralegislativo/adapters/ProjetoAdapter.java @@ -225,9 +225,11 @@ public class ProjetoAdapter extends RecyclerView.Adapter + diff --git a/app/src/main/res/layout/activity_sobre.xml b/app/src/main/res/layout/activity_sobre.xml new file mode 100644 index 0000000..a1c5a74 --- /dev/null +++ b/app/src/main/res/layout/activity_sobre.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index a5796ff..364482c 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -79,4 +79,11 @@ + diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 607fdbd..0e6fe19 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -1,6 +1,6 @@ - diff --git a/app/src/main/res/menu/menu_sobre.xml b/app/src/main/res/menu/menu_sobre.xml new file mode 100644 index 0000000..89a61f7 --- /dev/null +++ b/app/src/main/res/menu/menu_sobre.xml @@ -0,0 +1,6 @@ + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_action_share.png b/app/src/main/res/mipmap-hdpi/ic_action_share.png new file mode 100644 index 0000000..de262e5 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_action_share.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index cde69bc..b254453 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_action_share.png b/app/src/main/res/mipmap-mdpi/ic_action_share.png new file mode 100644 index 0000000..6df5f2a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_action_share.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index c133a0c..9a2ada4 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_action_share.png b/app/src/main/res/mipmap-xhdpi/ic_action_share.png new file mode 100644 index 0000000..5b63722 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_action_share.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bfa42f0..3be3050 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_action_share.png b/app/src/main/res/mipmap-xxhdpi/ic_action_share.png new file mode 100644 index 0000000..a34309e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_action_share.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 324e72c..ce9d647 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_action_share.png b/app/src/main/res/mipmap-xxxhdpi/ic_action_share.png new file mode 100644 index 0000000..6b110c6 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_action_share.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..269c765 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 4b60c47..23dc128 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,15 +3,19 @@ #ddd #000 - #C8E6C9 - #4CAF50 - #388E3C + #FF5722 + #E64A19 + #FFCCBC + #536DFE #212121 #727272 + #FFFFFF + #B6B6B6 + + #1ea4f7 - #ccc + #B6B6B6 - #448AFF #FF9800 #F57C00 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f978947..090e354 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,10 +17,14 @@ Apoio Não Apoio - ComentarioActivity + Comente Hello blank fragment + Sobre + Hello world! + O ParticipaCidadão é um aplicativo em fase experimental destinado a tornar mais fácil e atraente a conexão/interação do cidadão com a Câmara de Vereadores e com temas públicos. Em outras palavras, é também uma plataforma de cidadania e democracia para o cidadão que quer participar mais ativamente do desenvolvimento de sua cidade.\n\n Essa versão piloto, por enquanto, só disponibiliza os dados da Câmara Municipal de Ouro Branco/MG. Entretanto, gradativamente, outros municípios serão incluídos na base de dados. \n\n Mais do que um aplicativo, é uma atitude! Participe! Venha construir conosco as cidades do Brasil de 2030. + Agradecimentos:\nWesley Rocha wesleyweb@gmail.com - criador da logomarca -- libgit2 0.21.2