lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-22 04:29:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove twoPane code

Browse source
This commit is contained in:
jacques 2021-03-17 13:34:12 +01:00
parent 766a7d7174
commit 9f1509c5ec
1 changed files with 12 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
View file

@ -9,6 +9,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.icu.util.Calendar; import android.icu.util.Calendar;
import android.os.Bundle; import android.os.Bundle;
import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
@ -16,10 +17,8 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@ -28,7 +27,6 @@ import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import com.google.zxing.client.android.Intents; import com.google.zxing.client.android.Intents;
import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentIntegrator;
@ -39,12 +37,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import static net.foucry.pilldroid.UtilDate.convertDate;
import static net.foucry.pilldroid.UtilDate.date2String; import static net.foucry.pilldroid.UtilDate.date2String;
import static net.foucry.pilldroid.Utils.intRandomExclusive; import static net.foucry.pilldroid.Utils.intRandomExclusive;
// Todo: - use same color in website and about // Todo: - use same color in website and about
// - remove twopanes code
/** /**
* An activity representing a list of Medicaments. This activity * An activity representing a list of Medicaments. This activity
* has different presentations for handset and tablet-size devices. On * has different presentations for handset and tablet-size devices. On
@ -65,12 +62,6 @@ public class MedicamentListActivity extends AppCompatActivity {
final Boolean DBDEMO = false; final Boolean DBDEMO = false;
public final int CUSTOMIZED_REQUEST_CODE = 0x0000ffff; public final int CUSTOMIZED_REQUEST_CODE = 0x0000ffff;
private ViewPager viewPager;
private LinearLayout dotsLayout;
private int[] layouts;
private Button btnSkip, btnNext;
/** /**
* Start tutorial * Start tutorial
*/ */
@ -196,14 +187,6 @@ public class MedicamentListActivity extends AppCompatActivity {
} }
constructMedsList(); constructMedsList();
if (findViewById(R.id.medicament_detail_container) != null) {
// The detail container view will be present only in the
// large-screen layouts (res/values-w900dp).
// If this view is present, then the
// activity should be in two-pane mode.
mTwoPane = true;
}
} }
@ -387,7 +370,11 @@ public class MedicamentListActivity extends AppCompatActivity {
public void scheduleAlarm() { public void scheduleAlarm() {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(System.currentTimeMillis()); calendar.setTimeInMillis(System.currentTimeMillis());
calendar.set(Calendar.HOUR_OF_DAY, 12); calendar.set(Calendar.HOUR_OF_DAY, 13);
if (DateUtils.isToday(calendar.getTimeInMillis())) {
calendar.setTimeInMillis(calendar.getTimeInMillis() + (24 * 60 * 60 * 1000));
}
PendingIntent alarmIntent; PendingIntent alarmIntent;
@ -490,21 +477,11 @@ public class MedicamentListActivity extends AppCompatActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Medicament medicamentCourant = mValues.get(position); Medicament medicamentCourant = mValues.get(position);
if (mTwoPane) { // This part is used on tablets Context context = v.getContext();
Bundle arguments = new Bundle(); Intent intent = new Intent(context, MedicamentDetailActivity.class);
arguments.putSerializable("medicament", medicamentCourant); intent.putExtra("medicament", medicamentCourant);
MedicamentDetailFragment fragment = new MedicamentDetailFragment(); startActivityForResult(intent, CUSTOMIZED_REQUEST_CODE);
fragment.setArguments(arguments); overridePendingTransition(R.anim.slide_from_right, R.anim.slide_to_left);
getSupportFragmentManager().beginTransaction()
.replace(R.id.medicament_detail_container, fragment)
.commit();
} else { // This part is used on phones
Context context = v.getContext();
Intent intent = new Intent(context, MedicamentDetailActivity.class);
intent.putExtra("medicament", medicamentCourant);
startActivityForResult(intent, CUSTOMIZED_REQUEST_CODE);
overridePendingTransition(R.anim.slide_from_right, R.anim.slide_to_left);
}
} }
}); });
} }