lacerta-dev/Lacerta
1
0
Fork 0
mirror of https://github.com/lacerta-doc/Lacerta.git synced 2024-11-22 07:53:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #100 from lacerta-doc/submit_jan23

Browse Source 
Submit jan23
This commit is contained in:
ろむねこ 2024-01-23 05:25:02 +09:00 committed by GitHub
commit 60f279d365
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
component/viewer/src/main/java/one/nem/lacerta/component/viewer/RevAdapter.java
View File

@ -8,6 +8,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
@ -40,13 +41,14 @@ public class RevAdapter extends RecyclerView.Adapter<RevAdapter.RevViewHolder>{
@Override
public void onBindViewHolder(@NonNull RevAdapter.RevViewHolder holder, int position) {
VcsRevModel revModel = revModels.get(position);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
holder.title.setText(revModel.getCommitMessage());
if (FeatureSwitch.Vcs.disableBranchDisplay) {
// holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()));
holder.detail.setText("DateTimePlaceholder");
holder.detail.setText(simpleDateFormat.format(revModel.getCreatedAt()));
} else {
// holder.detail.setText(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(revModel.getCreatedAt().toInstant()) + " " + revModel.getBranchName());
holder.detail.setText("DateTimePlaceholder" + " " + revModel.getBranchName());
holder.detail.setText(simpleDateFormat.format(revModel.getCreatedAt())+ " " + revModel.getBranchName());
}
holder.revId.setText("RevID: " + revModel.getId());

14
feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java
View File

@ -8,11 +8,14 @@ import android.view.View;
import android.view.ViewGroup;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.navigation.Navigation;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.appbar.AppBarLayout;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
@ -56,6 +59,17 @@ public class HomeTopFragment extends Fragment {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_home_top, container, false);
// Set status bar color
AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
appBarLayout.addOnOffsetChangedListener((appBarLayout1, verticalOffset) -> {
if (Math.abs(verticalOffset) == appBarLayout1.getTotalScrollRange()) {
// Collapsed
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
} else if (verticalOffset == 0) {
// Expanded
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
}
});
return view;
}

2
feature/library/build.gradle
View File

@ -53,5 +53,7 @@ dependencies {
implementation project(':utils')
implementation project(':component:viewer')
}

28
feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryPageFragment.java
View File

@ -1,6 +1,7 @@
package one.nem.lacerta.feature.library;
import android.app.AlertDialog;
import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.NonNull;
@ -35,6 +36,7 @@ import java.util.Objects;
import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.lacerta.component.viewer.ViewerMainActivity;
import one.nem.lacerta.data.Document;
import one.nem.lacerta.data.LacertaLibrary;
import one.nem.lacerta.model.FragmentNavigation;
@ -117,19 +119,13 @@ public class LibraryPageFragment extends Fragment {
// Set status bar color
AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
@Override
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
if (Math.abs(verticalOffset) == appBarLayout.getTotalScrollRange()) {
// Collapsed
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
} else if (verticalOffset == 0) {
// Expanded
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
} else {
// Somewhere in between
// Here you can add a color transition if you want
}
appBarLayout.addOnOffsetChangedListener((appBarLayout1, verticalOffset) -> {
if (Math.abs(verticalOffset) == appBarLayout1.getTotalScrollRange()) {
// Collapsed
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
} else if (verticalOffset == 0) {
// Expanded
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
}
});
return view;
@ -179,7 +175,11 @@ public class LibraryPageFragment extends Fragment {
@Override
public void onDocumentSelected(String documentId, String documentName) {
Toast.makeText(getContext(), "Document selected! documentId: " + documentId + ", documentName: " + documentName, Toast.LENGTH_SHORT).show();
Intent intent = new Intent(getContext(), ViewerMainActivity.class);
logger.debug("LibraryTopFragment", "Document selected! documentId: " + documentId + ", documentName: " + documentName);
intent.putExtra("documentId", documentId);
intent.putExtra("documentName", documentName);
startActivity(intent);
}
});

13
feature/setting/src/main/java/one/nem/lacerta/setting/SettingTopFragment.java
View File

@ -10,6 +10,8 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.appbar.AppBarLayout;
import java.util.ArrayList;
import one.nem.lacerta.setting.model.SettingListItem;
@ -86,6 +88,17 @@ public class SettingTopFragment extends Fragment {
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
recyclerView.setAdapter(new ListItemAdapter(settingListItems));
// Set status bar color
AppBarLayout appBarLayout = view.findViewById(R.id.app_bar_layout);
appBarLayout.addOnOffsetChangedListener((appBarLayout1, verticalOffset) -> {
if (Math.abs(verticalOffset) == appBarLayout1.getTotalScrollRange()) {
// Collapsed
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSecondaryContainer));
} else if (verticalOffset == 0) {
// Expanded
getActivity().getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), one.nem.lacerta.shared.ui.R.color.colorSurface));
}
});
return view;
}
}

4
utils/src/main/java/one/nem/lacerta/utils/FeatureSwitch.java
View File

@ -11,6 +11,7 @@ public class FeatureSwitch {
}
public static class Viewer {
// TODO-rca: 実装
public static boolean showOriginalImage = false;
public static int maxImageSize = 1024;
public static boolean showProgressBarWhenLoading = true;
@ -18,7 +19,7 @@ public class FeatureSwitch {
public static class FeatureMaster {
public static boolean enableSearch = false;
public static boolean enableDebugMenu = true;
public static boolean enableDebugMenu = false;
}
public static class Vcs {
@ -26,6 +27,7 @@ public class FeatureSwitch {
}
public static class Setting {
// TODO-rca: 実装
public static boolean showDisplayMenu = false;
public static boolean showDataMenu = false;
public static boolean showScanMenu = false;