diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
new file mode 100644
index 000000000..c38a3c1f4
--- /dev/null
+++ b/.idea/markdown-navigator.xml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 871829d8b..63f7e50d3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,72 +3,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..f9490a104
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+**Mastalab** est une application Android dédiée à l'instance [mastodon.etalab.gouv.fr](https://mastodon.etalab.gouv.fr)
+
+Pour l'utiliser vous devez posséder un compte sur cette instance. Si ce n'est pas le cas, vous pouvez [vous inscrire](https://mastodon.etalab.gouv.fr/auth/sign_up).
+Cependant vous devez avoir une adresse email qui soit listée sur [cette page](https://forum.etalab.gouv.fr/t/mastodon-le-reseau-social-libre-et-decentralise-en-plein-decollage/3538).
+
+
+Pour toute remarque ou demande d'évolution, vous pouvez me contacter sur cette instance : [@tschneider](https://mastodon.etalab.gouv.fr/@tschneider)
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index b58bf7e45..50d103687 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
minSdkVersion 15
targetSdkVersion 25
versionCode 2
- versionName "1.0.2"
+ versionName "1.0.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/app/mastodon-etalab-v1.0.3.apk b/app/mastodon-etalab-v1.0.3.apk
new file mode 100644
index 000000000..db2567033
Binary files /dev/null and b/app/mastodon-etalab-v1.0.3.apk differ
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java
index bde2f96dd..91e2b01df 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java
@@ -16,6 +16,7 @@ package fr.gouv.etalab.mastodon.activities;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
@@ -45,19 +46,25 @@ public class AboutActivity extends AppCompatActivity {
PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
about_version.setText(getResources().getString(R.string.about_vesrion, version));
- } catch (PackageManager.NameNotFoundException e) {
- e.printStackTrace();
- }
+ } catch (PackageManager.NameNotFoundException ignored) {}
TextView about_developer = (TextView) findViewById(R.id.about_developer);
TextView about_license = (TextView) findViewById(R.id.about_license);
+ TextView about_code = (TextView) findViewById(R.id.about_code);
+ about_developer.setMovementMethod(LinkMovementMethod.getInstance());
+ about_license.setMovementMethod(LinkMovementMethod.getInstance());
+ about_code.setMovementMethod(LinkMovementMethod.getInstance());
+ about_developer.setLinkTextColor(Color.BLUE);
+ about_license.setLinkTextColor(Color.BLUE);
+ about_code.setLinkTextColor(Color.BLUE);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
about_developer.setText(Html.fromHtml(getString(R.string.about_developer), Html.FROM_HTML_MODE_COMPACT));
about_license.setText(Html.fromHtml(getString(R.string.about_license), Html.FROM_HTML_MODE_COMPACT));
-
+ about_code.setText(Html.fromHtml(getString(R.string.about_code), Html.FROM_HTML_MODE_COMPACT));
}else {
about_developer.setText(Html.fromHtml(getString(R.string.about_developer)));
about_license.setText(Html.fromHtml(getString(R.string.about_license)));
+ about_code.setText(Html.fromHtml(getString(R.string.about_code)));
}
}
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
index c7bce7db1..39d489b0a 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
@@ -145,10 +145,19 @@ public class MainActivity extends AppCompatActivity
username.setText(String.format("@%s",account.getUsername()));
displayedName.setText(account.getDisplay_name());
imageLoader.displayImage(account.getAvatar(), profilePicture, options);
- if (savedInstanceState == null) {
+
+ boolean menuWasSelected = false;
+ if( getIntent() != null && getIntent().getExtras() != null ){
+ Bundle extras = getIntent().getExtras();
+ if (extras.getInt(INTENT_ACTION) == INTENT_NOTIFICATION){
+ navigationView.setCheckedItem(R.id.nav_notification);
+ navigationView.getMenu().performIdentifierAction(R.id.nav_notification, 0);
+ menuWasSelected = true;
+ }
+ }
+ if (savedInstanceState == null && !menuWasSelected) {
navigationView.setCheckedItem(R.id.nav_home);
navigationView.getMenu().performIdentifierAction(R.id.nav_home, 0);
-
}
//Title and menu selection when back pressed
getSupportFragmentManager().addOnBackStackChangedListener(
@@ -211,6 +220,17 @@ public class MainActivity extends AppCompatActivity
drawer.closeDrawer(GravityCompat.START);
} else {
super.onBackPressed();
+ //Hide search bar on back pressed
+ if( toolbar.getChildCount() > 0) {
+ for (int i = 0; i < toolbar.getChildCount(); i++) {
+ if (toolbar.getChildAt(i) instanceof EditText) {
+ InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow((toolbar.getChildAt(i)).getWindowToken(), 0);
+ toolbar.removeViewAt(i);
+ break;
+ }
+ }
+ }
}
}
@@ -247,6 +267,8 @@ public class MainActivity extends AppCompatActivity
if(toolbar.getChildAt(i) instanceof EditText){
//Nothing in the search bar
if( ((EditText) toolbar.getChildAt(i)).getText().toString().trim().equals("")){
+ InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow((toolbar.getChildAt(i)).getWindowToken(), 0);
toolbar.removeViewAt(i);
return true;
}else{
@@ -308,6 +330,8 @@ public class MainActivity extends AppCompatActivity
if( toolbar.getChildCount() > 0) {
for (int i = 0; i < toolbar.getChildCount(); i++) {
if (toolbar.getChildAt(i) instanceof EditText) {
+ InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow((toolbar.getChildAt(i)).getWindowToken(), 0);
toolbar.removeViewAt(i);
break;
}
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 988185f89..f94e777b9 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -22,6 +22,7 @@
>
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6bc83a98e..9b2980938 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -121,6 +121,7 @@
Version %1$s
Développeur : @tschneider@mastodon.etalab.gouv.fr
Licence : GNU GPL V3
+ Code source : bitbucket
Conversation