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

Prima implementazione delle PreferenceSettings

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-03-04 11:45:13 +01:00
parent a1bfda134a
commit 3a16176b6d
11 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

2
app/build.gradle
View File

@ -83,7 +83,7 @@ android {
abortOnError false
}
dynamicFeatures = [":dynamic__base"]
dynamicFeatures = [":dynamic_vgalimenti"]
}

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

@ -235,6 +235,7 @@ public class MainActivity extends AppCompatActivity
if(addToBackStack) ft.addToBackStack(fragment.getTag());
ft.commit();
fragmentManager.executePendingTransactions();
}
}

30
app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
View File

@ -11,25 +11,15 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.preference.PreferenceFragmentCompat;
import butterknife.ButterKnife;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.databinding.FragmentMainSettingsBinding;
import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
public class MainSettingsFragment extends Fragment implements ITitledFragment {
public class MainSettingsFragment extends PreferenceFragmentCompat implements ITitledFragment {
private FragmentMainSettingsBinding mBinding;
public MainSettingsFragment() {
// Required empty public constructor
}
public static MainSettingsFragment newInstance() {
MainSettingsFragment fragment = new MainSettingsFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreateActionBar(AppCompatTextView titleText, Context context) {
@ -37,20 +27,8 @@ public class MainSettingsFragment extends Fragment implements ITitledFragment {
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_settings, container, false);
ButterKnife.bind(this, mBinding.getRoot());
return mBinding.getRoot();
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
setPreferencesFromResource(R.xml.app_preferences, rootKey);
}
}

2
app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
View File

@ -269,7 +269,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS
mAdapter.updateItems(groupedOrdiniInevasi);
}
RunnableArgs<OrdineVenditaGroupedInevasoDTO.Ordine> onSingleSelectionChanged = dto -> {
private RunnableArgs<OrdineVenditaGroupedInevasoDTO.Ordine> onSingleSelectionChanged = dto -> {
List<OrdineVenditaGroupedInevasoDTO> selectedOrders = mHelper.getSelectedOrders(groupedOrdiniInevasi);
if(!SettingsManager.iDB().isFlagMultiClienteOrdV()){

4
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
View File

@ -634,6 +634,10 @@ public class DialogInputQuantity {
} else {
if(quantityDTO.batchLot != null && !quantityDTO.batchLot.isEmpty()) {
quantityDTO.batchLot.set(quantityDTO.batchLot.get().toUpperCase());
}
dialogCallback.onResult(quantityDTO);
currentAlert.dismiss();

5
app/src/main/res/values-it/strings.xml
View File

@ -184,4 +184,9 @@
<string name="recovering_data">Recupero dati</string>
<string name="wait_a_moment">Attendi qualche istante</string>
<string name="check_in_printer">Stampante Accettazione</string>
<string name="check_out_printer">Stampante Vendita</string>
</resources>

5
app/src/main/res/values/arrays.xml
View File

@ -14,4 +14,9 @@
<item>@color/green_500</item> <!-- Accettazione -->
</array>
<array name="printerTypes">
<item>Primary</item>
<item>Secondary</item>
</array>
</resources>

5
app/src/main/res/values/strings.xml
View File

@ -188,4 +188,9 @@
<string name="title_dynamic_vgalimenti">VGAlimenti customization</string>
<string name="title_dynamic__base">Base customization</string>
<string name="check_in_printer">Check In printer</string>
<string name="check_out_printer">Check Out printer</string>
</resources>

43
app/src/main/res/xml/app_preferences.xml
View File

@ -1,27 +1,30 @@
<androidx.preference.PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.preference.PreferenceCategory
android:title="@string/general_settings">
<SwitchPreferenceCompat
app:key="notifications"
app:title="Enable message notifications"/>
<android.support.v7.preference.SwitchPreferenceCompat
android:key="key1"
android:title="Switch Preference"
android:summary="Switch Summary"
android:defaultValue="true" />
<Preference
app:key="feedback"
app:title="Send feedback"
app:summary="Report technical issues or suggest new features"/>
<android.support.v7.preference.EditTextPreference
android:key="key2"
android:title="EditText Preference"
android:summary="EditText Summary"
android:dialogMessage="Dialog Message"
android:defaultValue="Default value" />
<android.support.v7.preference.CheckBoxPreference
android:key="key3"
android:title="CheckBox Preference"
android:summary="CheckBox Summary"
android:defaultValue="true"/>
</androidx.preference.PreferenceCategory>
<ListPreference
app:key="check_in_printer"
app:title="@string/check_in_printer"
app:summary="%s"
app:entries="@array/printerTypes"
app:entryValues="@array/printerTypes"
app:defaultValue="0" />
<ListPreference
app:key="check_out_printer"
app:title="@string/check_out_printer"
app:summary="%s"
app:entries="@array/printerTypes"
app:entryValues="@array/printerTypes"
app:defaultValue="0" />
</androidx.preference.PreferenceScreen>

1
waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
View File

@ -310,6 +310,7 @@ open class WaterfallToolbar : androidx.cardview.widget.CardView {
post {
// it's safe to use "!!" here, since savedState will
// always store values properly set in onSaveInstanceState()
cardElevation = state.elevation!!.toFloat()
orthodoxPosition = state.orthodoxPosition!!
realPosition = state.realPosition!!