Fixes a small bug when screen is off and the first page is loaded + prepares release 1.2.8
This commit is contained in:
parent
21da69eb7f
commit
45f3022ebe
|
@ -7,8 +7,8 @@ android {
|
||||||
applicationId "fr.gouv.etalab.mastodon"
|
applicationId "fr.gouv.etalab.mastodon"
|
||||||
minSdkVersion 15
|
minSdkVersion 15
|
||||||
targetSdkVersion 25
|
targetSdkVersion 25
|
||||||
versionCode 24
|
versionCode 25
|
||||||
versionName "1.2.7"
|
versionName "1.2.8"
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
|
@ -32,6 +32,4 @@ dependencies {
|
||||||
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
|
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
|
||||||
compile 'com.evernote:android-job:1.1.11'
|
compile 'com.evernote:android-job:1.1.11'
|
||||||
compile 'com.github.chrisbanes:PhotoView:2.0.0'
|
compile 'com.github.chrisbanes:PhotoView:2.0.0'
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
|
@ -96,6 +96,14 @@ public class AboutActivity extends AppCompatActivity implements OnRetrieveSearcA
|
||||||
startActivity(browserIntent);
|
startActivity(browserIntent);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Button about_translation = (Button) findViewById(R.id.about_translation);
|
||||||
|
about_translation.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://translate.yandex.com/"));
|
||||||
|
startActivity(browserIntent);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,6 @@ import android.content.SharedPreferences;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
|
|
||||||
import fr.gouv.etalab.mastodon.helper.Helper;
|
import fr.gouv.etalab.mastodon.helper.Helper;
|
||||||
import mastodon.etalab.gouv.fr.mastodon.R;
|
import mastodon.etalab.gouv.fr.mastodon.R;
|
||||||
|
|
||||||
|
|
|
@ -230,8 +230,8 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou
|
||||||
this.context = context;
|
this.context = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onStop() {
|
public void onDestroy() {
|
||||||
super.onStop();
|
super.onDestroy();
|
||||||
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
|
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
|
||||||
asyncTask.cancel(true);
|
asyncTask.cancel(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -148,8 +148,8 @@ public class DisplayFollowRequestSentFragment extends Fragment implements OnRetr
|
||||||
this.context = context;
|
this.context = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onStop() {
|
public void onDestroy() {
|
||||||
super.onStop();
|
super.onDestroy();
|
||||||
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
|
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
|
||||||
asyncTask.cancel(true);
|
asyncTask.cancel(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -149,8 +149,8 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
|
||||||
this.context = context;
|
this.context = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onStop() {
|
public void onDestroy() {
|
||||||
super.onStop();
|
super.onDestroy();
|
||||||
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
|
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
|
||||||
asyncTask.cancel(true);
|
asyncTask.cancel(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -248,9 +248,9 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
|
||||||
this.context = context;
|
this.context = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void onStop() {
|
public void onDestroy (){
|
||||||
super.onStop();
|
super.onDestroy();
|
||||||
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
|
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
|
||||||
asyncTask.cancel(true);
|
asyncTask.cancel(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -109,4 +109,27 @@
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- About translation -->
|
||||||
|
<LinearLayout
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:padding="10dp"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
<TextView
|
||||||
|
android:text="@string/about_yandex"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:gravity="center"
|
||||||
|
android:layout_weight="2"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
<Button
|
||||||
|
android:id="@+id/about_translation"
|
||||||
|
android:text="@string/about_yandex_action"
|
||||||
|
style="@style/Base.Widget.AppCompat.Button.Colored"
|
||||||
|
android:layout_weight="3"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
|
@ -127,5 +127,30 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Translations -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
android:layout_marginBottom="10dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
tools:ignore="UselessParent">
|
||||||
|
<!-- TRANSLATION TITLE -->
|
||||||
|
<TextView
|
||||||
|
android:text="@string/privacy_API_yandex_title"
|
||||||
|
style="?attr/shapeBorder"
|
||||||
|
android:paddingBottom="10dp"
|
||||||
|
android:layout_marginBottom="10dp"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
<!-- API AUTHORIZATIONS CONTENT -->
|
||||||
|
<TextView
|
||||||
|
android:text="@string/privacy_API_yandex_authorizations"
|
||||||
|
android:autoLink="web"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
|
@ -161,6 +161,7 @@
|
||||||
<string name="about_license_action">GNU GPL V3</string>
|
<string name="about_license_action">GNU GPL V3</string>
|
||||||
<string name="about_code">Code source : </string>
|
<string name="about_code">Code source : </string>
|
||||||
<string name="about_code_action">bitbucket</string>
|
<string name="about_code_action">bitbucket</string>
|
||||||
|
<string name="about_yandex">Traduction des pouets :</string>
|
||||||
<!-- Conversation -->
|
<!-- Conversation -->
|
||||||
<string name="conversation">Conversation</string>
|
<string name="conversation">Conversation</string>
|
||||||
|
|
||||||
|
@ -305,4 +306,10 @@
|
||||||
- <b>Android-Job</b> : Pour la gestion des services\n
|
- <b>Android-Job</b> : Pour la gestion des services\n
|
||||||
- <b>PhotoView</b> : Pour la gestion des images
|
- <b>PhotoView</b> : Pour la gestion des images
|
||||||
</string>
|
</string>
|
||||||
</resources>
|
|
||||||
|
<string name="privacy_API_yandex_title">Traduction des pouets</string>
|
||||||
|
<string name="privacy_API_yandex_authorizations">
|
||||||
|
L\'application offre la possibilité de traduire les pouets en utilisant les paramètres régionaux de l\'appareil et l\'API de Yandex.\n
|
||||||
|
Yandex a sa propre politique de confidentialité qui peut être consultée à l\'adresse suivante : https://yandex.ru/legal/confidential/?lang=en
|
||||||
|
</string>
|
||||||
|
</resources>
|
|
@ -163,6 +163,8 @@
|
||||||
<string name="about_license_action">GNU GPL V3</string>
|
<string name="about_license_action">GNU GPL V3</string>
|
||||||
<string name="about_code">Source code: </string>
|
<string name="about_code">Source code: </string>
|
||||||
<string name="about_code_action">Bitbucket</string>
|
<string name="about_code_action">Bitbucket</string>
|
||||||
|
<string name="about_yandex">Translation of toots:</string>
|
||||||
|
<string name="about_yandex_action" translatable="false">Powered by Yandex.Translate</string>
|
||||||
<!-- Conversation -->
|
<!-- Conversation -->
|
||||||
<string name="conversation">Conversation</string>
|
<string name="conversation">Conversation</string>
|
||||||
|
|
||||||
|
@ -310,4 +312,10 @@
|
||||||
</string>
|
</string>
|
||||||
|
|
||||||
<string name="yandex" translatable="false"><a hreh="http://translate.yandex.com/">Powered by Yandex.Translate</a></string>
|
<string name="yandex" translatable="false"><a hreh="http://translate.yandex.com/">Powered by Yandex.Translate</a></string>
|
||||||
</resources>
|
|
||||||
|
<string name="privacy_API_yandex_title">Translation of toots</string>
|
||||||
|
<string name="privacy_API_yandex_authorizations">
|
||||||
|
The application offers the ability to translate toots using the locale of the device and the Yandex API.\n
|
||||||
|
Yandex has its proper privacy-policy which can be found here: https://yandex.ru/legal/confidential/?lang=en
|
||||||
|
</string>
|
||||||
|
</resources>
|
Loading…
Reference in New Issue