mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

rebased

Browse source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2023-08-30 08:23:44 +02:00
parent 920c69dc15
commit f32cb61f59
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
6 changed files with 1163 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1155
app/schemas/com.nextcloud.client.database.NextcloudDatabase/73.json Normal file
View file

File diff suppressed because it is too large Load diff

BIN
app/screenshots/gplay/debug/com.nextcloud.client.SyncedFoldersActivityIT_testSyncedFolderDialog.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

4
app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java
View file

@ -25,6 +25,7 @@ package com.nextcloud.client;
import android.app.Activity;
import android.content.Intent;
import com.nextcloud.client.preferences.SubFolderRule;
import com.owncloud.android.AbstractIT;
import com.owncloud.android.datamodel.MediaFolderType;
import com.owncloud.android.datamodel.SyncedFolderDisplayItem;
@ -72,7 +73,8 @@ public class SyncedFoldersActivityIT extends AbstractIT {
1000,
"Name",
MediaFolderType.IMAGE,
false);
false,
SubFolderRule.YEAR_MONTH);
SyncedFolderPreferencesDialogFragment sut = SyncedFolderPreferencesDialogFragment.newInstance(item, 0);
Intent intent = new Intent(targetContext, SyncedFoldersActivity.class);

3
app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt
View file

@ -64,7 +64,8 @@ import com.owncloud.android.db.ProviderMeta
AutoMigration(from = 66, to = 67),
AutoMigration(from = 68, to = 69),
AutoMigration(from = 69, to = 70),
AutoMigration(from = 71, to = 72)
AutoMigration(from = 71, to = 72),
AutoMigration(from = 72, to = 73)
],
exportSchema = true
)

2
app/src/main/java/com/owncloud/android/db/ProviderMeta.java
View file

@ -35,7 +35,7 @@ import java.util.List;
*/
public class ProviderMeta {
public static final String DB_NAME = "filelist";
public static final int DB_VERSION = 72;
public static final int DB_VERSION = 73;
private ProviderMeta() {
// No instance

4
app/src/main/res/layout/synced_folders_settings_layout.xml
View file

@ -48,8 +48,8 @@
<TextView
android:id="@+id/synced_folders_settings_local_folder_path"
android:layout_width="2dp"
android:layout_height="15dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:maxLines="2"
android:textColor="?android:attr/textColorSecondary"