karolina/avh-plan-android
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed small things in Settings Fragment, release number: 1.2.4

Browse Source
This commit is contained in:
Deniz Düzgören
2019-05-01 18:14:21 +02:00
parent d690a2604a
commit 00c893380e
7 changed files with 137 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/denizd/substitutionplan/FoodFragment.kt
+3 -3
View File
@@ -18,9 +18,9 @@ class FoodFragment : Fragment(R.layout.food_layout) {
private lateinit var recyclerView: RecyclerView
private val mAdapter = FoodAdapter(foodArrayList)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.food_layout, null)
}
// override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
// return inflater.inflate(R.layout.food_layout, null)
// } // TODO do I need this?
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
app/src/main/java/com/denizd/substitutionplan/FragmentSettings.java
+117 -100
View File
@@ -1,6 +1,7 @@
package com.denizd.substitutionplan;
import android.app.AlertDialog;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.net.Uri;
@@ -522,109 +523,121 @@ public class FragmentSettings extends Fragment {
dialogButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (dialogEditText.getText().toString().equals("@DEV_DIAGNOSTICS")) {
AlertDialog.Builder alertDialogDev;
if (prefs.getInt("themeInt", 0) == 1) {
alertDialogDev = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomDark);
} else {
alertDialogDev = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
}
alertDialogDev.setTitle(getString(R.string.diagnosticsmenu));
View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.diagnostics_dialog, null);
final TextView dialogText = dialogView.findViewById(R.id.dialogtext);
setDiagnosticsText(dialogText, prefs);
Button launch = dialogView.findViewById(R.id.btnResetLaunch);
Button notif = dialogView.findViewById(R.id.btnResetNotif);
launch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
edit.putInt("launchDev", 0);
edit.apply();
setDiagnosticsText(dialogText, prefs);
switch (dialogEditText.getText().toString()) {
case "@DIAGNOSTICS": {
AlertDialog.Builder alertDialogDev;
if (prefs.getInt("themeInt", 0) == 1) {
alertDialogDev = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomDark);
} else {
alertDialogDev = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
}
});
notif.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
edit.putInt("notificationTestNumberDev", 0);
edit.apply();
setDiagnosticsText(dialogText, prefs);
}
});
alertDialogDev.setView(dialogView);
alertDialogDev.show();
} else if (dialogEditText.getText().toString().equals("2018-04-20")) {
Toast.makeText(getActivity(), "◢ ◤",
Toast.LENGTH_LONG).show();
} else if (dialogEditText.getText().toString().equals("Q1 Matchmaker")) {
final Random gen = new Random();
AlertDialog.Builder alertDialogDev;
if (prefs.getInt("themeInt", 0) == 1) {
alertDialogDev = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomDark);
} else {
alertDialogDev = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
}
alertDialogDev.setTitle(getString(R.string.dating));
View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.dating_dialog, null);
Button datingBtn = dialogView.findViewById(R.id.dating_btn);
final EditText boyT = dialogView.findViewById(R.id.dating_txt1);
final EditText girlT = dialogView.findViewById(R.id.dating_txt2);
final CheckBox boy = dialogView.findViewById(R.id.cb1);
final CheckBox girl = dialogView.findViewById(R.id.cb2);
final TextView percentage = dialogView.findViewById(R.id.dating_txtp);
datingBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
double boyP = 0, girlP = 0, perc = 0;
if (boyT.getText().toString().isEmpty() || boy.isChecked()) {
boyT.setText(names.boy[gen.nextInt(names.boy.length)]);
}
if (girlT.getText().toString().isEmpty() || girl.isChecked()) {
girlT.setText(names.girl[gen.nextInt(names.girl.length)]);
}
for (int i = 0; i < boyT.getText().length(); i++) {
boyP++;
}
for (int i = 0; i < girlT.getText().length(); i++) {
girlP++;
}
if (girlP < boyP) {
perc = (girlP / boyP) * 100;
}
if (girlP > boyP) {
perc = (boyP / girlP) * 100;
}
char multiplyTempBoy = boyT.getText().charAt(boyT.getText().length() - 1);
char multiplyTempGirl = girlT.getText().charAt(girlT.getText().length() - 1);
double multiply = Character.getNumericValue(multiplyTempBoy) + Character.getNumericValue(multiplyTempGirl);
multiply = multiply / 1.2;
if (perc == 0) {
perc += 30;
}
DecimalFormat df = new DecimalFormat("#.##");
if (perc * (multiply / 40) > 100) {
percentage.setText("100.00%");
} else {
percentage.setText(df.format(perc * (multiply / 40)) + "%");
}
} catch (NullPointerException e) {
Toast.makeText(getActivity(), getString(R.string.error),
Toast.LENGTH_SHORT).show();
alertDialogDev.setTitle(getString(R.string.diagnosticsmenu));
View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.diagnostics_dialog, null);
final TextView dialogText = dialogView.findViewById(R.id.dialogtext);
setDiagnosticsText(dialogText, prefs);
Button launch = dialogView.findViewById(R.id.btnResetLaunch);
Button notif = dialogView.findViewById(R.id.btnResetNotif);
launch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
edit.putInt("launchDev", 0);
edit.apply();
setDiagnosticsText(dialogText, prefs);
}
}
});
alertDialogDev.setView(dialogView);
alertDialogDev.show();
});
notif.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
edit.putInt("notificationTestNumberDev", 0);
edit.apply();
setDiagnosticsText(dialogText, prefs);
}
});
} else {
Toast.makeText(getActivity(), getString(R.string.nothinghappened),
Toast.LENGTH_LONG).show();
alertDialogDev.setView(dialogView);
alertDialogDev.show();
break;
}
case "2018-04-20":
Toast.makeText(getActivity(), getEmojiByUnicode(0x1F494),
Toast.LENGTH_LONG).show();
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.youtube.com/watch?v=ynHYW1iTcq0")); // FTL
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setPackage("com.google.android.youtube");
startActivity(intent);
break;
case "Q1 Matchmaker": {
final Random gen = new Random();
AlertDialog.Builder alertDialogDev;
if (prefs.getInt("themeInt", 0) == 1) {
alertDialogDev = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomDark);
} else {
alertDialogDev = new AlertDialog.Builder(getContext(), R.style.AlertDialogCustomLight);
}
alertDialogDev.setTitle(getString(R.string.dating));
View dialogView = LayoutInflater.from(getContext()).inflate(R.layout.dating_dialog, null);
Button datingBtn = dialogView.findViewById(R.id.dating_btn);
final EditText boyT = dialogView.findViewById(R.id.dating_txt1);
final EditText girlT = dialogView.findViewById(R.id.dating_txt2);
final CheckBox boy = dialogView.findViewById(R.id.cb1);
final CheckBox girl = dialogView.findViewById(R.id.cb2);
final TextView percentage = dialogView.findViewById(R.id.dating_txtp);
datingBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
try {
double boyP = 0, girlP = 0, perc = 0;
if (boyT.getText().toString().isEmpty() || boy.isChecked()) {
boyT.setText(names.boy[gen.nextInt(names.boy.length)]);
}
if (girlT.getText().toString().isEmpty() || girl.isChecked()) {
girlT.setText(names.girl[gen.nextInt(names.girl.length)]);
}
for (int i = 0; i < boyT.getText().length(); i++) {
boyP++;
}
for (int i = 0; i < girlT.getText().length(); i++) {
girlP++;
}
if (girlP < boyP) {
perc = (girlP / boyP) * 100;
}
if (girlP > boyP) {
perc = (boyP / girlP) * 100;
}
char multiplyTempBoy = boyT.getText().charAt(boyT.getText().length() - 1);
char multiplyTempGirl = girlT.getText().charAt(girlT.getText().length() - 1);
double multiply = Character.getNumericValue(multiplyTempBoy) + Character.getNumericValue(multiplyTempGirl);
multiply = multiply / 1.2;
if (perc == 0) {
perc += 30;
}
DecimalFormat df = new DecimalFormat("#.##");
if (perc * (multiply / 40) > 100) {
percentage.setText("100.00%");
} else {
percentage.setText(df.format(perc * (multiply / 40)) + "%");
}
} catch (NullPointerException e) {
Toast.makeText(getActivity(), getString(R.string.error),
Toast.LENGTH_SHORT).show();
}
}
});
alertDialogDev.setView(dialogView);
alertDialogDev.show();
break;
}
default:
Toast.makeText(getActivity(), getString(R.string.nothinghappened),
Toast.LENGTH_LONG).show();
break;
}
}
});
@@ -635,6 +648,10 @@ public class FragmentSettings extends Fragment {
});
}
private String getEmojiByUnicode(int unicode){
return new String(Character.toChars(unicode));
}
private void setDiagnosticsText(TextView dialogText, SharedPreferences prefs) {
dialogText.setText("First Launch: " + prefs.getString("firstTimeDev", "") +
"\n\nApp launched: " + prefs.getInt("launchDev", 0) +
app/src/main/java/com/denizd/substitutionplan/MainActivity.java
+12 -10
View File
@@ -102,6 +102,7 @@ public class MainActivity extends AppCompatActivity {
Window window = this.getWindow();
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
// window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
// window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
// window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
@@ -130,7 +131,8 @@ public class MainActivity extends AppCompatActivity {
@Override
public void onSlide(@NonNull View bottomSheet, float slideOffset) {
// bottomSheetCloser.setVisibility(View.VISIBLE);
// bottomSheetCloser.setAlpha(slideOffset);
}
});
@@ -181,15 +183,15 @@ public class MainActivity extends AppCompatActivity {
TextView dialogText = dialogView.findViewById(R.id.dialogtext);
dialogText.setText(R.string.chinaDialog);
secretText.setText(R.string.orbuy);
Button searchbtn = dialogView.findViewById(R.id.searchbtn);
searchbtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(Intent.ACTION_WEB_SEARCH);
intent.putExtra(SearchManager.QUERY, marketName + " disable power optimisation");
startActivity(intent);
}
});
// Button searchbtn = dialogView.findViewById(R.id.searchbtn);
// searchbtn.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// Intent intent = new Intent(Intent.ACTION_WEB_SEARCH);
// intent.putExtra(SearchManager.QUERY, marketName + " disable power optimisation");
// startActivity(intent);
// }
// });
alertDialog.setView(dialogView);
alertDialog.show();