Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes a small bug when screen is off and the first page is loaded + prepares release 1.2.8

This commit is contained in:
tom79 2017-07-05 13:12:50 +02:00
parent 21da69eb7f
commit 45f3022ebe
12 changed files with 85 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15
targetSdkVersion 25
versionCode 24
versionName "1.2.7"
versionCode 25
versionName "1.2.8"
}
buildTypes {
release {
@ -32,6 +32,4 @@ dependencies {
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
compile 'com.evernote:android-job:1.1.11'
compile 'com.github.chrisbanes:PhotoView:2.0.0'
}

BIN
app/mastodon-etalab-v1.2.8.apk Normal file
View File

Binary file not shown.

8
app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java
View File

@ -96,6 +96,14 @@ public class AboutActivity extends AppCompatActivity implements OnRetrieveSearcA
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);
}
});
}

1
app/src/main/java/fr/gouv/etalab/mastodon/activities/PrivacyActivity.java
View File

@ -19,7 +19,6 @@ import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import fr.gouv.etalab.mastodon.helper.Helper;
import mastodon.etalab.gouv.fr.mastodon.R;

4
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java
View File

@ -230,8 +230,8 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou
this.context = context;
}
public void onStop() {
super.onStop();
public void onDestroy() {
super.onDestroy();
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
asyncTask.cancel(true);
}

4
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java
View File

@ -148,8 +148,8 @@ public class DisplayFollowRequestSentFragment extends Fragment implements OnRetr
this.context = context;
}
public void onStop() {
super.onStop();
public void onDestroy() {
super.onDestroy();
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
asyncTask.cancel(true);
}

4
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java
View File

@ -149,8 +149,8 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
this.context = context;
}
public void onStop() {
super.onStop();
public void onDestroy() {
super.onDestroy();
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
asyncTask.cancel(true);
}

6
app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java
View File

@ -248,9 +248,9 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
this.context = context;
}
public void onStop() {
super.onStop();
@Override
public void onDestroy (){
super.onDestroy();
if(asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING)
asyncTask.cancel(true);
}

23
app/src/main/res/layout/activity_about.xml
View File

@ -109,4 +109,27 @@
android:layout_height="wrap_content" />
</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>

27
app/src/main/res/layout/activity_privacy.xml
View File

@ -127,5 +127,30 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</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>
</ScrollView>
</ScrollView>

9
app/src/main/res/values-fr/strings.xml
View File

@ -161,6 +161,7 @@
<string name="about_license_action">GNU GPL V3</string>
<string name="about_code">Code source : </string>
<string name="about_code_action">bitbucket</string>
<string name="about_yandex">Traduction des pouets :</string>
<!-- Conversation -->
<string name="conversation">Conversation</string>
@ -305,4 +306,10 @@
- <b>Android-Job</b> : Pour la gestion des services\n
- <b>PhotoView</b> : Pour la gestion des images
</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>

10
app/src/main/res/values/strings.xml
View File

@ -163,6 +163,8 @@
<string name="about_license_action">GNU GPL V3</string>
<string name="about_code">Source code: </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 -->
<string name="conversation">Conversation</string>
@ -310,4 +312,10 @@
</string>
<string name="yandex" translatable="false">&lt;a hreh="http://translate.yandex.com/">Powered by Yandex.Translate&lt;/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>