gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove "New" suffix from classes

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-06-07 12:11:27 +02:00
parent c71d1da334
commit c5c52f2f6e
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
6 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt
View File

@ -26,7 +26,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem
import com.nextcloud.talk.remotefilebrowser.repositories.RemoteFileBrowserItemsRepository import com.nextcloud.talk.remotefilebrowser.repositories.RemoteFileBrowserItemsRepository
import com.nextcloud.talk.utils.FileSortOrderNew import com.nextcloud.talk.utils.FileSortOrder
import com.nextcloud.talk.utils.preferences.AppPreferences import com.nextcloud.talk.utils.preferences.AppPreferences
import io.reactivex.Observer import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
@ -62,7 +62,7 @@ class RemoteFileBrowserItemsViewModel @Inject constructor(
class LoadedState(val items: List<RemoteFileBrowserItem>) : ViewState class LoadedState(val items: List<RemoteFileBrowserItem>) : ViewState
class FinishState(val selectedPaths: Set<String>) : ViewState class FinishState(val selectedPaths: Set<String>) : ViewState
private val initialSortOrder = FileSortOrderNew.getFileSortOrder(appPreferences.sorting) private val initialSortOrder = FileSortOrder.getFileSortOrder(appPreferences.sorting)
private val sortingPrefListener: SortChangeListener = SortChangeListener() private val sortingPrefListener: SortChangeListener = SortChangeListener()
private val _viewState: MutableLiveData<ViewState> = MutableLiveData(InitialState) private val _viewState: MutableLiveData<ViewState> = MutableLiveData(InitialState)
@ -70,8 +70,8 @@ class RemoteFileBrowserItemsViewModel @Inject constructor(
get() = _viewState get() = _viewState
// TODO incorporate into view state object? // TODO incorporate into view state object?
private val _fileSortOrder: MutableLiveData<FileSortOrderNew> = MutableLiveData(initialSortOrder) private val _fileSortOrder: MutableLiveData<FileSortOrder> = MutableLiveData(initialSortOrder)
val fileSortOrder: LiveData<FileSortOrderNew> val fileSortOrder: LiveData<FileSortOrder>
get() = _fileSortOrder get() = _fileSortOrder
private val _currentPath: MutableLiveData<String> = MutableLiveData(ROOT_PATH) private val _currentPath: MutableLiveData<String> = MutableLiveData(ROOT_PATH)
@ -137,7 +137,7 @@ class RemoteFileBrowserItemsViewModel @Inject constructor(
} }
private fun onSelectSortOrder(newSortOrderString: String) { private fun onSelectSortOrder(newSortOrderString: String) {
val newSortOrder = FileSortOrderNew.getFileSortOrder(newSortOrderString) val newSortOrder = FileSortOrder.getFileSortOrder(newSortOrderString)
if (newSortOrder.name != fileSortOrder.value?.name) { if (newSortOrder.name != fileSortOrder.value?.name) {
_fileSortOrder.value = newSortOrder _fileSortOrder.value = newSortOrder
val currentState = viewState.value val currentState = viewState.value

2
app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
View File

@ -637,7 +637,7 @@ public class DisplayUtils {
} }
public static @StringRes public static @StringRes
int getSortOrderStringId(FileSortOrderNew sortOrder) { int getSortOrderStringId(FileSortOrder sortOrder) {
switch (sortOrder.name) { switch (sortOrder.name) {
case sort_z_to_a_id: case sort_z_to_a_id:
return R.string.menu_item_sort_by_name_z_a; return R.string.menu_item_sort_by_name_z_a;

23
app/src/main/java/com/nextcloud/talk/utils/FileSortOrderNew.java → app/src/main/java/com/nextcloud/talk/utils/FileSortOrder.java
View File

@ -24,7 +24,6 @@ package com.nextcloud.talk.utils;
import android.text.TextUtils; import android.text.TextUtils;
import com.nextcloud.talk.components.filebrowser.adapters.items.BrowserFileItem;
import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem; import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem;
import java.util.Collections; import java.util.Collections;
@ -37,7 +36,7 @@ import androidx.annotation.Nullable;
/** /**
* Sort order * Sort order
*/ */
public class FileSortOrderNew { public class FileSortOrder {
public static final String sort_a_to_z_id = "sort_a_to_z"; public static final String sort_a_to_z_id = "sort_a_to_z";
public static final String sort_z_to_a_id = "sort_z_to_a"; public static final String sort_z_to_a_id = "sort_z_to_a";
public static final String sort_old_to_new_id = "sort_old_to_new"; public static final String sort_old_to_new_id = "sort_old_to_new";
@ -45,17 +44,17 @@ public class FileSortOrderNew {
public static final String sort_small_to_big_id = "sort_small_to_big"; public static final String sort_small_to_big_id = "sort_small_to_big";
public static final String sort_big_to_small_id = "sort_big_to_small"; public static final String sort_big_to_small_id = "sort_big_to_small";
public static final FileSortOrderNew sort_a_to_z = new FileSortOrderByNameNew(sort_a_to_z_id, true); public static final FileSortOrder sort_a_to_z = new FileSortOrderByName(sort_a_to_z_id, true);
public static final FileSortOrderNew sort_z_to_a = new FileSortOrderByNameNew(sort_z_to_a_id, false); public static final FileSortOrder sort_z_to_a = new FileSortOrderByName(sort_z_to_a_id, false);
public static final FileSortOrderNew sort_old_to_new = new FileSortOrderByDateNew(sort_old_to_new_id, true); public static final FileSortOrder sort_old_to_new = new FileSortOrderByDate(sort_old_to_new_id, true);
public static final FileSortOrderNew sort_new_to_old = new FileSortOrderByDateNew(sort_new_to_old_id, false); public static final FileSortOrder sort_new_to_old = new FileSortOrderByDate(sort_new_to_old_id, false);
public static final FileSortOrderNew sort_small_to_big = new FileSortOrderBySizeNew(sort_small_to_big_id, true); public static final FileSortOrder sort_small_to_big = new FileSortOrderBySize(sort_small_to_big_id, true);
public static final FileSortOrderNew sort_big_to_small = new FileSortOrderBySizeNew(sort_big_to_small_id, false); public static final FileSortOrder sort_big_to_small = new FileSortOrderBySize(sort_big_to_small_id, false);
public static final Map<String, FileSortOrderNew> sortOrders; public static final Map<String, FileSortOrder> sortOrders;
static { static {
HashMap<String, FileSortOrderNew> temp = new HashMap<>(); HashMap<String, FileSortOrder> temp = new HashMap<>();
temp.put(sort_a_to_z.name, sort_a_to_z); temp.put(sort_a_to_z.name, sort_a_to_z);
temp.put(sort_z_to_a.name, sort_z_to_a); temp.put(sort_z_to_a.name, sort_z_to_a);
temp.put(sort_old_to_new.name, sort_old_to_new); temp.put(sort_old_to_new.name, sort_old_to_new);
@ -69,12 +68,12 @@ public class FileSortOrderNew {
public String name; public String name;
public boolean isAscending; public boolean isAscending;
public FileSortOrderNew(String name, boolean ascending) { public FileSortOrder(String name, boolean ascending) {
this.name = name; this.name = name;
isAscending = ascending; isAscending = ascending;
} }
public static FileSortOrderNew getFileSortOrder(@Nullable String key) { public static FileSortOrder getFileSortOrder(@Nullable String key) {
if (TextUtils.isEmpty(key) || !sortOrders.containsKey(key)) { if (TextUtils.isEmpty(key) || !sortOrders.containsKey(key)) {
return sort_a_to_z; return sort_a_to_z;
} else { } else {

4
app/src/main/java/com/nextcloud/talk/utils/FileSortOrderByDateNew.java → app/src/main/java/com/nextcloud/talk/utils/FileSortOrderByDate.java
View File

@ -30,9 +30,9 @@ import java.util.List;
/** /**
* Created by srkunze on 28.08.17. * Created by srkunze on 28.08.17.
*/ */
public class FileSortOrderByDateNew extends FileSortOrderNew { public class FileSortOrderByDate extends FileSortOrder {
FileSortOrderByDateNew(String name, boolean ascending) { FileSortOrderByDate(String name, boolean ascending) {
super(name, ascending); super(name, ascending);
} }

4
app/src/main/java/com/nextcloud/talk/utils/FileSortOrderByNameNew.java → app/src/main/java/com/nextcloud/talk/utils/FileSortOrderByName.java
View File

@ -32,9 +32,9 @@ import third_parties.daveKoeller.AlphanumComparator;
/** /**
* Created by srkunze on 28.08.17. * Created by srkunze on 28.08.17.
*/ */
public class FileSortOrderByNameNew extends FileSortOrderNew { public class FileSortOrderByName extends FileSortOrder {
FileSortOrderByNameNew(String name, boolean ascending) { FileSortOrderByName(String name, boolean ascending) {
super(name, ascending); super(name, ascending);
} }

4
app/src/main/java/com/nextcloud/talk/utils/FileSortOrderBySizeNew.java → app/src/main/java/com/nextcloud/talk/utils/FileSortOrderBySize.java
View File

@ -30,9 +30,9 @@ import java.util.List;
/** /**
* Sorts files by sizes * Sorts files by sizes
*/ */
public class FileSortOrderBySizeNew extends FileSortOrderNew { public class FileSortOrderBySize extends FileSortOrder {
FileSortOrderBySizeNew(String name, boolean ascending) { FileSortOrderBySize(String name, boolean ascending) {
super(name, ascending); super(name, ascending);
} }