liangsheng8708
/
FoldCraftLauncher
mirror of https://mirror.ghproxy.com/https://github.com/FCL-Team/FoldCraftLauncher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add retry button

This commit is contained in:
Tungstend 2023-07-06 18:58:52 +08:00
parent 1d4d5b9a66
commit 4ab148e5f2
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
FCL/src/main/java/com/tungsten/fcl/ui/download/DownloadPage.java
View File

@ -8,6 +8,8 @@ import android.widget.ListView;
import android.widget.ScrollView;
import com.tungsten.fcl.R;
import com.tungsten.fcl.setting.Profile;
import com.tungsten.fcl.ui.manage.ManageUI;
import com.tungsten.fcl.util.AndroidUtils;
import com.tungsten.fcl.util.FXUtils;
import com.tungsten.fclcore.fakefx.beans.property.BooleanProperty;
@ -30,6 +32,7 @@ import com.tungsten.fcllibrary.component.theme.ThemeEngine;
import com.tungsten.fcllibrary.component.ui.FCLCommonPage;
import com.tungsten.fcllibrary.component.view.FCLButton;
import com.tungsten.fcllibrary.component.view.FCLEditText;
import com.tungsten.fcllibrary.component.view.FCLImageButton;
import com.tungsten.fcllibrary.component.view.FCLProgressBar;
import com.tungsten.fcllibrary.component.view.FCLSpinner;
import com.tungsten.fcllibrary.component.view.FCLUILayout;
@ -40,16 +43,18 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
public class DownloadPage extends FCLCommonPage implements View.OnClickListener {
public class DownloadPage extends FCLCommonPage implements ManageUI.VersionLoadable, View.OnClickListener {
protected RemoteModRepository repository;
protected final BooleanProperty supportChinese = new SimpleBooleanProperty();
private final ObjectProperty<Profile.ProfileVersion> version = new SimpleObjectProperty<>();
protected final ListProperty<String> downloadSources = new SimpleListProperty<>(this, "downloadSources", FXCollections.observableArrayList());
protected final StringProperty downloadSource = new SimpleStringProperty();
private final StringProperty gameVersion = new SimpleStringProperty(this, "gameVersion", "");
private final ObjectProperty<CategoryIndented> category = new SimpleObjectProperty<>(this, "category", new CategoryIndented(0, null));
private final ObjectProperty<RemoteModRepository.SortType> sortType = new SimpleObjectProperty<>(this, "sortType", RemoteModRepository.SortType.POPULARITY);
private TaskExecutor executor;
private Runnable retrySearch;
private RemoteModListAdapter adapter;
private ScrollView searchLayout;
@ -64,6 +69,7 @@ public class DownloadPage extends FCLCommonPage implements View.OnClickListener
private ListView listView;
private FCLProgressBar progressBar;
private FCLImageButton retry;
public void setLoading(boolean loading) {
Schedulers.androidUIThread().execute(() -> {
@ -75,6 +81,17 @@ public class DownloadPage extends FCLCommonPage implements View.OnClickListener
sortSpinner.setEnabled(!loading);
progressBar.setVisibility(loading ? View.VISIBLE : View.GONE);
listView.setVisibility(loading ? View.GONE : View.VISIBLE);
if (loading) {
retry.setVisibility(View.GONE);
}
});
}
public void setFailed() {
Schedulers.androidUIThread().execute(() -> {
retry.setVisibility(View.VISIBLE);
progressBar.setVisibility(View.GONE);
listView.setVisibility(View.GONE);
});
}
@ -87,6 +104,7 @@ public class DownloadPage extends FCLCommonPage implements View.OnClickListener
}
public void search(String userGameVersion, RemoteModRepository.Category category, int pageOffset, String searchFilter, RemoteModRepository.SortType sort) {
retrySearch = null;
setLoading(true);
if (executor != null && !executor.isCancelled()) {
executor.cancel();
@ -100,6 +118,9 @@ public class DownloadPage extends FCLCommonPage implements View.OnClickListener
});
listView.setAdapter(adapter);
} else {
setFailed();
retrySearch = () -> search(userGameVersion, category, pageOffset, searchFilter, sort);
}
}).executor(true);
}
@ -139,6 +160,8 @@ public class DownloadPage extends FCLCommonPage implements View.OnClickListener
listView = findViewById(R.id.list);
progressBar = findViewById(R.id.progress);
retry = findViewById(R.id.retry);
retry.setOnClickListener(this);
nameEditText.setHint(supportChinese.get() ? getContext().getString(R.string.search_hint_chinese) : getContext().getString(R.string.search_hint_english));
@ -206,6 +229,11 @@ public class DownloadPage extends FCLCommonPage implements View.OnClickListener
search("", null, 0, "", RemoteModRepository.SortType.POPULARITY);
}
@Override
public void loadVersion(Profile profile, String version) {
this.version.set(new Profile.ProfileVersion(profile, version));
}
@Override
public Task<?> refresh(Object... param) {
return null;
@ -216,6 +244,9 @@ public class DownloadPage extends FCLCommonPage implements View.OnClickListener
if (v == search) {
search();
}
if (v == retry && retrySearch != null) {
retrySearch.run();
}
}
private static class CategoryIndented {

11
FCL/src/main/res/layout/page_download.xml
View File

@ -139,10 +139,17 @@
android:dividerHeight="0dp" />
<com.tungsten.fcllibrary.component.view.FCLProgressBar
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:id="@+id/progress"/>
android:layout_centerInParent="true" />
<com.tungsten.fcllibrary.component.view.FCLImageButton
android:id="@+id/retry"
android:src="@drawable/ic_baseline_refresh_24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"/>
</RelativeLayout>