Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First work on XML

Browse Source
This commit is contained in:
Gius95
2019-01-20 21:32:05 +01:00
parent 620df27552
commit f56bb7dd95
11 changed files with 200 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/it/integry/integrywmsnative/MainActivity.java
View File

@@ -124,8 +124,8 @@ public class MainActivity extends AppCompatActivity
@Override
public boolean onNavigationItemSelected(MenuItem item) {
mBinding.appBarMain.waterfallToolbar.resetElevation();
mBinding.appBarMain.waterfallToolbar.setRecyclerView(null);
//mBinding.appBarMain.waterfallToolbar.resetElevation();
//mBinding.appBarMain.waterfallToolbar.setRecyclerView(null);
// Handle navigation view item clicks here.
Fragment fragment = null;
@@ -194,7 +194,7 @@ public class MainActivity extends AppCompatActivity
}
if(fragment instanceof IRecyclerFragment) {
((IRecyclerFragment) fragment).setWaterfallToolbar(mBinding.appBarMain.waterfallToolbar);
//((IRecyclerFragment) fragment).setWaterfallToolbar(mBinding.appBarMain.waterfallToolbar);
}
if(fragment instanceof ISelectAllFragment && ((ISelectAllFragment)fragment).isEnabled()) {
@@ -235,7 +235,7 @@ public class MainActivity extends AppCompatActivity
private void init(){
initSessionData();
//initSessionData();
ServerStatusChecker.getIstance().addCallback(value -> {
if(value && (!mIsOnline || firstCheckExecution)){
@@ -269,7 +269,7 @@ public class MainActivity extends AppCompatActivity
if(SettingsManager.iDB().getDatiAzienda() != null && SettingsManager.iDB().getDatiAzienda().isLogoAvailable()) {
ImageView imageViewLogoAzienda = headerLayout.findViewById(R.id.drawer_logoAzienda);
imageViewLogoAzienda.setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo());
// imageViewLogoAzienda.setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo());
}
}

17
app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
View File

@@ -9,6 +9,8 @@ import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import net.cachapa.expandablelayout.ExpandableLayout;
@@ -16,6 +18,7 @@ import net.cachapa.expandablelayout.ExpandableLayout;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import de.hdodenhof.circleimageview.CircleImageView;
import it.integry.integrywmsnative.MainActivity;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker;
@@ -33,7 +36,8 @@ public class MainFragment extends Fragment implements ITitledFragment {
@BindView(R.id.no_connection_top_layout) ExpandableLayout mNoConnectionLayout;
@BindView(R.id.current_user_name) TextView currentUsername;
//@BindView(R.id.drawer_username) TextView drawerUsername;
@BindView(R.id.current_deposito) TextView currentDeposito;
@BindView(R.id.drawer_logoAzienda) CircleImageView currentLogoAzienda;
private View mView;
@@ -82,10 +86,19 @@ public class MainFragment extends Fragment implements ITitledFragment {
WiFiCheckerViewHolder wiFiCheckerViewHolder = new WiFiCheckerViewHolder(getActivity(), mView, R.id.wifi_power);
wiFiCheckerViewHolder.startMonitoring();
initSessionData();
}
private void initSessionData() {
currentUsername.setText(SettingsManager.i().user.fullname);
//drawerUsername.setText(SettingsManager.i().user.fullname);
//TextView textViewDeposito = headerLayout.findViewById(R.id.drawer_deposito);
currentDeposito.setText(String.format("%s - %s", SettingsManager.i().userSession.depo.getCodMdep(), SettingsManager.i().userSession.depo.getDescrizione()));
if(SettingsManager.iDB().getDatiAzienda() != null && SettingsManager.iDB().getDatiAzienda().isLogoAvailable()) {
currentLogoAzienda.setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo());
}
}
private void collapseNoConnectionLayout(){