Prepares release 1.10.4
This commit is contained in:
parent
0bd2f40d64
commit
4dbb024069
|
@ -7,8 +7,8 @@ android {
|
||||||
applicationId "fr.gouv.etalab.mastodon"
|
applicationId "fr.gouv.etalab.mastodon"
|
||||||
minSdkVersion 15
|
minSdkVersion 15
|
||||||
targetSdkVersion 27
|
targetSdkVersion 27
|
||||||
versionCode 128
|
versionCode 129
|
||||||
versionName "1.10.4-beta-1"
|
versionName "1.10.4"
|
||||||
}
|
}
|
||||||
flavorDimensions "default"
|
flavorDimensions "default"
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
@ -50,6 +50,7 @@ ext.guavaLibraryVersion = '24.1-android'
|
||||||
ext.photoViewLibraryVersion = '2.0.0'
|
ext.photoViewLibraryVersion = '2.0.0'
|
||||||
ext.swipebackLibraryVersion = '1.0.2'
|
ext.swipebackLibraryVersion = '1.0.2'
|
||||||
ext.ratethisappLibraryVersion = '1.2.0'
|
ext.ratethisappLibraryVersion = '1.2.0'
|
||||||
|
ext.uploadServiceVersion = "3.4.2"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
|
implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
|
||||||
|
@ -70,7 +71,8 @@ dependencies {
|
||||||
implementation 'com.github.stom79:country-picker-android:1.2.0'
|
implementation 'com.github.stom79:country-picker-android:1.2.0'
|
||||||
implementation 'com.github.stom79:mytransl:1.5'
|
implementation 'com.github.stom79:mytransl:1.5'
|
||||||
|
|
||||||
|
implementation "net.gotev:uploadservice:$uploadServiceVersion"
|
||||||
|
implementation "net.gotev:uploadservice-okhttp:$uploadServiceVersion"
|
||||||
playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion"
|
playstoreImplementation "io.github.kobakei:ratethisapp:$ratethisappLibraryVersion"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -133,23 +133,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
if( theme == Helper.THEME_LIGHT) {
|
|
||||||
about_code.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
about_thekinrar.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
about_translation.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
about_license.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
|
||||||
}
|
|
||||||
|
|
||||||
TextView about_website = findViewById(R.id.about_website);
|
|
||||||
about_website.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://tom79.bitbucket.io"));
|
|
||||||
startActivity(browserIntent);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
TextView about_wiki = findViewById(R.id.about_wiki);
|
TextView about_wiki = findViewById(R.id.about_wiki);
|
||||||
SpannableString content = new SpannableString(about_wiki.getText().toString());
|
SpannableString content = new SpannableString(about_wiki.getText().toString());
|
||||||
content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
|
content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
|
||||||
|
@ -181,6 +164,28 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if( theme == Helper.THEME_LIGHT) {
|
||||||
|
about_code.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
||||||
|
about_thekinrar.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
||||||
|
about_translation.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
||||||
|
about_license.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
||||||
|
about_support.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
||||||
|
paypal.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white));
|
||||||
|
}
|
||||||
|
|
||||||
|
TextView about_website = findViewById(R.id.about_website);
|
||||||
|
about_website.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://tom79.bitbucket.io"));
|
||||||
|
startActivity(browserIntent);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
setTitle(R.string.action_about);
|
setTitle(R.string.action_about);
|
||||||
lv_contributors.setExpanded(true);
|
lv_contributors.setExpanded(true);
|
||||||
lv_developers.setExpanded(true);
|
lv_developers.setExpanded(true);
|
||||||
|
|
Loading…
Reference in New Issue