thomas
/
ODP-AppVehOwn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve ui

This commit is contained in:
yannick.blanken@csc-online.eu 2022-07-17 19:17:11 +02:00
parent 2160ab5f9d
commit 2186d0411b
4 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/eu/csc/vehown/ui/base/ActivityBaseDetailContent.java
View File

@ -1,5 +1,6 @@
package eu.csc.vehown.ui.base;
import androidx.appcompat.app.ActionBar;
import androidx.fragment.app.FragmentActivity;
import android.content.Intent;
@ -11,6 +12,7 @@ import eu.csc.vehown.R;
import eu.csc.vehown.ui.fragments.UserProfileFragment;
import eu.csc.vehown.ui.fragments.details.FragmentDetailDevice;
import eu.csc.vehown.ui.fragments.details.FragmentDetailVehicle;
import eu.csc.vehown.ui.registration.VehiclesAndDevicesFragment;
import eu.csc.vehown.ui.registration.device.DeviceRegistrationFragment;
import eu.csc.vehown.ui.registration.vehicle.VehicleRegistrationFragment;
@ -24,6 +26,7 @@ public class ActivityBaseDetailContent extends AbstractAppCompatActivity {
private static final int ARG_ITEM_TYPE_VEHICLE = 1;
private static final int ARG_ITEM_TYPE_DEVICE = 2;
private static final int ARG_ITEM_TYPE_PROFILE = 10;
private static final int ARG_ITEM_TYPE_VEHICLE_AND_DEVICE = 20;
private static final int ARG_ITEM_TYPE_VEHICLE_REGISTER = 3;
private static final int ARG_ITEM_TYPE_DEVICE_REGISTER = 4;
@ -61,6 +64,14 @@ public class ActivityBaseDetailContent extends AbstractAppCompatActivity {
return intent;
}
public static Intent getVehicleAndDeviceFragmentInstance(FragmentActivity activity, int i) {
Intent intent = new Intent(activity, ActivityBaseDetailContent.class);
intent.putExtra(ARG_ITEM_TYPE, ARG_ITEM_TYPE_VEHICLE_AND_DEVICE);
return intent;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -91,12 +102,25 @@ public class ActivityBaseDetailContent extends AbstractAppCompatActivity {
case ARG_ITEM_TYPE_PROFILE:
switchFragment(R.id.flContent, UserProfileFragment.newInstance());
break;
case ARG_ITEM_TYPE_VEHICLE_AND_DEVICE:
switchFragment(R.id.flContent, VehiclesAndDevicesFragment.newInstance());
break;
}
} else {
}
ActionBar actionBar = getSupportActionBar();
// showing the back button in action bar
actionBar.setDisplayHomeAsUpEnabled(true);
}
@Override
public boolean onSupportNavigateUp() {
finish();
return true;
}
@Override

2
app/src/main/java/eu/csc/vehown/ui/fragments/UserProfileFragment.java
View File

@ -79,7 +79,9 @@ public class UserProfileFragment extends AbstractFragment {
binding.btnVehicleShow.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
var intent = ActivityBaseDetailContent.getVehicleAndDeviceFragmentInstance(getActivity(), 1);
getActivity().startActivityForResult(intent, 1);
}
});

5
app/src/main/java/eu/csc/vehown/ui/registration/VehiclesAndDevicesFragment.java
View File

@ -13,6 +13,7 @@ import android.widget.TextView;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.RecyclerView;
import eu.csc.vehown.R;
@ -43,6 +44,10 @@ public class VehiclesAndDevicesFragment extends AbstractFragment {
private final String TAG = VehiclesAndDevicesFragment.class.getSimpleName();
public static VehiclesAndDevicesFragment newInstance() {
return new VehiclesAndDevicesFragment();
}
@Override
public View onCreateView(@NotNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
binding = FragmentShowVehiclesAndDevicesBinding.inflate(inflater, container, false);

2
app/src/main/res/layout/user_profile_fragment.xml
View File

@ -100,4 +100,6 @@
</com.google.android.material.card.MaterialCardView>
</FrameLayout>