Prepares release 1.0.3
This commit is contained in:
parent
ed09cd95f1
commit
78d684e710
|
@ -3,6 +3,24 @@
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<entry_points version="2.0" />
|
<entry_points version="2.0" />
|
||||||
</component>
|
</component>
|
||||||
|
<component name="JavadocGenerationManager">
|
||||||
|
<option name="OUTPUT_DIRECTORY" />
|
||||||
|
<option name="OPTION_SCOPE" value="protected" />
|
||||||
|
<option name="OPTION_HIERARCHY" value="true" />
|
||||||
|
<option name="OPTION_NAVIGATOR" value="true" />
|
||||||
|
<option name="OPTION_INDEX" value="true" />
|
||||||
|
<option name="OPTION_SEPARATE_INDEX" value="true" />
|
||||||
|
<option name="OPTION_DOCUMENT_TAG_USE" value="false" />
|
||||||
|
<option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
|
||||||
|
<option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
|
||||||
|
<option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
|
||||||
|
<option name="OPTION_DEPRECATED_LIST" value="true" />
|
||||||
|
<option name="OTHER_OPTIONS" value="" />
|
||||||
|
<option name="HEAP_SIZE" />
|
||||||
|
<option name="LOCALE" />
|
||||||
|
<option name="OPEN_IN_BROWSER" value="true" />
|
||||||
|
<option name="OPTION_INCLUDE_LIBS" value="false" />
|
||||||
|
</component>
|
||||||
<component name="NullableNotNullManager">
|
<component name="NullableNotNullManager">
|
||||||
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
|
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
|
||||||
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
**Mastalab** est une application Android dédiée à l'instance [mastodon.etalab.gouv.fr](https://mastodon.etalab.gouv.fr)
|
**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).
|
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).
|
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).
|
||||||
|
|
||||||
|
|
||||||
|
|
Binary file not shown.
|
@ -16,6 +16,7 @@ package fr.gouv.etalab.mastodon.activities;
|
||||||
|
|
||||||
import android.content.pm.PackageInfo;
|
import android.content.pm.PackageInfo;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
|
import android.graphics.Color;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
|
@ -45,19 +46,25 @@ public class AboutActivity extends AppCompatActivity {
|
||||||
PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
|
PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
|
||||||
String version = pInfo.versionName;
|
String version = pInfo.versionName;
|
||||||
about_version.setText(getResources().getString(R.string.about_vesrion, version));
|
about_version.setText(getResources().getString(R.string.about_vesrion, version));
|
||||||
} catch (PackageManager.NameNotFoundException e) {
|
} catch (PackageManager.NameNotFoundException ignored) {}
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
TextView about_developer = (TextView) findViewById(R.id.about_developer);
|
TextView about_developer = (TextView) findViewById(R.id.about_developer);
|
||||||
TextView about_license = (TextView) findViewById(R.id.about_license);
|
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) {
|
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_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_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 {
|
}else {
|
||||||
about_developer.setText(Html.fromHtml(getString(R.string.about_developer)));
|
about_developer.setText(Html.fromHtml(getString(R.string.about_developer)));
|
||||||
about_license.setText(Html.fromHtml(getString(R.string.about_license)));
|
about_license.setText(Html.fromHtml(getString(R.string.about_license)));
|
||||||
|
about_code.setText(Html.fromHtml(getString(R.string.about_code)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,16 +37,15 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<TextView
|
<TextView
|
||||||
android:autoLink="web"
|
|
||||||
android:id="@+id/about_developer"
|
android:id="@+id/about_developer"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:gravity="center_horizontal"
|
android:gravity="center_horizontal"
|
||||||
|
android:clickable="true"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<TextView
|
<TextView
|
||||||
android:autoLink="web"
|
|
||||||
android:id="@+id/about_license"
|
android:id="@+id/about_license"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_marginTop="10dp"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp"
|
||||||
|
@ -54,4 +53,12 @@
|
||||||
android:gravity="center_horizontal"
|
android:gravity="center_horizontal"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/about_code"
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:layout_gravity="center_horizontal"
|
||||||
|
android:gravity="center_horizontal"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
|
@ -121,6 +121,7 @@
|
||||||
<string name="about_vesrion">Version %1$s</string>
|
<string name="about_vesrion">Version %1$s</string>
|
||||||
<string name="about_developer">Développeur : <a href="https://mastodon.etalab.gouv.fr/@tschneider">@tschneider@mastodon.etalab.gouv.fr</a></string>
|
<string name="about_developer">Développeur : <a href="https://mastodon.etalab.gouv.fr/@tschneider">@tschneider@mastodon.etalab.gouv.fr</a></string>
|
||||||
<string name="about_license">Licence : <a href="https://www.gnu.org/licenses/quick-guide-gplv3.fr.html">GNU GPL V3</a></string>
|
<string name="about_license">Licence : <a href="https://www.gnu.org/licenses/quick-guide-gplv3.fr.html">GNU GPL V3</a></string>
|
||||||
|
<string name="about_code">Code source : <a href="https://bitbucket.org/tom79/mastodon_etalab">bitbucket</a></string>
|
||||||
<!-- Conversation -->
|
<!-- Conversation -->
|
||||||
<string name="conversation">Conversation</string>
|
<string name="conversation">Conversation</string>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue