Skip to content

Commit cbd597e

Browse files
committed
Update Gradle/SDK; add undelete narratives button
1 parent 905c7ef commit cbd597e

File tree

23 files changed

+86
-12
lines changed

23 files changed

+86
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.gradle
33
/local.properties
44
/.idea/workspace.xml
5+
/.idea/appInsightsSettings.xml
56
/.idea/assetWizardSettings.xml
67
/.idea/codeStyleSettings.xml
78
/.idea/codeStyles

.idea/AndroidProjectSystem.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MediaPhone/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ apply plugin: 'com.android.application'
33
android {
44
namespace 'ac.robinson.mediaphone'
55
testNamespace namespace + '.test'
6-
compileSdk 34
6+
compileSdk 35
77

8-
def getVersionCode = { -> return 59 }
8+
def getVersionCode = { -> return 60 }
99

1010
defaultConfig {
1111
manifestPlaceholders.providerId = 'mediaphone'
@@ -14,10 +14,10 @@ android {
1414

1515
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1616

17-
targetSdkVersion 34
17+
targetSdkVersion 35
1818
minSdkVersion 14
1919
versionCode getVersionCode()
20-
versionName '1.7.6'
20+
versionName '1.7.7'
2121
// versionNameSuffix = '-beta-1'
2222
resourceConfigurations += ['en', 'es', 'fr', 'nl', 'pt', 'pl', 'ru']
2323
}
@@ -70,6 +70,7 @@ dependencies {
7070

7171
//noinspection GradleDependency - upgrading to 1.12.0 and beyond requires API 19; we want to keep a lower minimum
7272
implementation 'com.google.android.material:material:1.11.0' // for overall UI appearance
73+
//noinspection GradleDependency - upgrading to 1.4.0 and beyond requires API 21; we want to keep a lower minimum
7374
implementation 'androidx.exifinterface:exifinterface:1.3.7' // for auto-selection of export resolution
7475
//noinspection GradleDependency - upgrading to 1.13.0 and beyond requires API 19; we want to keep a lower minimum
7576
implementation 'androidx.core:core:1.12.0' // for FileProvider

MediaPhone/src/main/java/ac/robinson/mediaphone/activity/PreferencesActivity.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,24 @@ private void setupPreferences() {
402402
aboutCategory.removePreference(installHelperPreference);
403403
}
404404

405+
// add the undelete narratives button restore all deleted narratives, (but not any deleted frames)
406+
Preference undeleteNarrativesPreference = preferenceScreen.findPreference(getString(R.string.key_undelete_narratives));
407+
undeleteNarrativesPreference.setOnPreferenceClickListener(preference -> {
408+
ContentResolver contentResolver = getContentResolver();
409+
ArrayList<String> deletedNarratives = NarrativesManager.findDeletedNarratives(contentResolver);
410+
411+
// undelete all deleted narratives
412+
for (String narrativeId : deletedNarratives) {
413+
NarrativeItem narrativeToUnDelete = NarrativesManager.findNarrativeByInternalId(contentResolver,
414+
narrativeId);
415+
narrativeToUnDelete.setDeleted(false);
416+
NarrativesManager.updateNarrative(contentResolver, narrativeToUnDelete);
417+
}
418+
UIUtilities.showFormattedToast(PreferencesActivity.this,
419+
R.string.preferences_undelete_narratives_completed, deletedNarratives.size());
420+
return true;
421+
});
422+
405423
// add the contact us button
406424
Preference contactUsPreference = preferenceScreen.findPreference(getString(R.string.key_contact_us));
407425
contactUsPreference.setOnPreferenceClickListener(preference -> {

MediaPhone/src/main/res/values-es/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@
284284
<string name="preferences_timing_editor_summary_off">El editor de tiempo está desactivado</string>
285285
<string name="preferences_timing_editor_summary_on">Utilice la opción de la pantalla de reproducción para establecer tiempos precisos para cada cuadro</string>
286286
<string name="preferences_install_timing_editor_narrative_success">Se ha instalado una breve narración de ayuda para aprender a editar los tiempos</string>
287+
<string name="preferences_undelete_narratives_title">Restaurar narraciones borradas</string>
288+
<string name="preferences_undelete_narratives_summary">Se restaurarán todas las narraciones borradas recientemente</string>
289+
<string name="preferences_undelete_narratives_completed">%1$d narraciones han sido restauradas</string>
287290

288291
<string name="preferences_about">Acerca de</string>
289292
<string name="preferences_contact_us_title">Estar en contacto</string>

MediaPhone/src/main/res/values-fr/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@
284284
<string name="preferences_timing_editor_summary_off">La fonction d\'éditeur de temps est désactivée</string>
285285
<string name="preferences_timing_editor_summary_on">Utilisez l\'option de l\'écran de lecture pour définir des temps précis pour chaque image</string>
286286
<string name="preferences_install_timing_editor_narrative_success">Un court récit d\'aide a été installé pour vous aider à apprendre comment modifier les horaires</string>
287+
<string name="preferences_undelete_narratives_title">Restaurer les récits supprimés</string>
288+
<string name="preferences_undelete_narratives_summary">Tous les récits récemment supprimés seront restaurés</string>
289+
<string name="preferences_undelete_narratives_completed">%1$d récits ont été restaurés</string>
287290

288291
<string name="preferences_about">À propos</string>
289292
<string name="preferences_contact_us_title">Contactez-nous</string>

0 commit comments

Comments
 (0)