From f56bb7dd95c424ba043f54b38ec410ecfb8a142c Mon Sep 17 00:00:00 2001 From: Gius95 Date: Sun, 20 Jan 2019 21:32:05 +0100 Subject: [PATCH] First work on XML --- .idea/caches/build_file_checksums.ser | Bin 729 -> 728 bytes .idea/modules.xml | 1 + .../integrywmsnative/MainActivity.java | 10 +- .../gest/main/MainFragment.java | 17 ++- .../drawable/circular_background_alpha_7.xml | 13 ++ .../main/res/drawable/dashboard_header_bg.xml | 12 ++ app/src/main/res/layout/app_bar_main.xml | 81 +++++------ app/src/main/res/layout/fragment_main.xml | 128 +++++++++++++++--- app/src/main/res/layout/nav_header_main.xml | 1 - app/src/main/res/values/dimens.xml | 2 + app/src/main/res/values/styles.xml | 2 +- 11 files changed, 200 insertions(+), 67 deletions(-) create mode 100644 app/src/main/res/drawable/circular_background_alpha_7.xml create mode 100644 app/src/main/res/drawable/dashboard_header_bg.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 79ac8948da96297d3cb2010b7ae5f6f6b4e5cb93..633dbfd0e6b31dd33a96d5b175282535f18c6f45 100644 GIT binary patch delta 71 zcmV-N0J#6z1=t0Um;`2XZkdss^BXHeI$TwAWpZ;|M`?9)WpHq1TrOvFVPtG&T$8N= d8 + diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index 99d90405..629c4724 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -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()); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index c95419d8..ba125851 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -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(){ diff --git a/app/src/main/res/drawable/circular_background_alpha_7.xml b/app/src/main/res/drawable/circular_background_alpha_7.xml new file mode 100644 index 00000000..d9c5e6c7 --- /dev/null +++ b/app/src/main/res/drawable/circular_background_alpha_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dashboard_header_bg.xml b/app/src/main/res/drawable/dashboard_header_bg.xml new file mode 100644 index 00000000..5bf81da8 --- /dev/null +++ b/app/src/main/res/drawable/dashboard_header_bg.xml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index 4d0cb088..5265218a 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -9,52 +9,53 @@ tools:context="it.integry.integrywmsnative.MainActivity"> - - + android:layout_height="?actionBarSize" + android:gravity="center_horizontal" + app:popupTheme="@style/AppTheme.PopupOverlay"> - + - + - + - + - - - - + diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 187dc478..f01c9abd 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -40,6 +40,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index b456d9ea..b1f55f30 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -15,7 +15,6 @@ android:theme="@style/ThemeOverlay.AppCompat.Dark"> 160dp 16dp 16dp + + 16dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 71c3e0a5..404f3b70 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ -