commit 3624c8a94baa0fae29e2f362d1c78521017309c5 parent 9e6cef3c85526d1282ba624524858129d1d99cb7 Author: Taco <SkytkRSfan3895@gmail.com> Date: Sat, 2 Feb 2019 16:08:08 -0500 migrate app to appCompat Signed-off-by: Taco <SkytkRSfan3895@gmail.com> Diffstat:
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle @@ -38,6 +38,7 @@ android { dependencies { // Support libraries + implementation 'com.android.support:support-v4:28.0.0' implementation 'com.android.support:appcompat-v7:28.0.0' // Other diff --git a/app/src/main/java/com/github/cythara/ListenerFragment.java b/app/src/main/java/com/github/cythara/ListenerFragment.java @@ -1,11 +1,11 @@ package com.github.cythara; import android.app.Activity; -import android.app.Fragment; import android.content.Context; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; +import android.support.v4.app.Fragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/github/cythara/MainActivity.java b/app/src/main/java/com/github/cythara/MainActivity.java @@ -1,9 +1,6 @@ package com.github.cythara; import android.Manifest; -import android.app.AlertDialog; -import android.app.AlertDialog.Builder; -import android.app.FragmentManager; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; @@ -12,7 +9,10 @@ import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.app.ActivityCompat; +import android.support.v4.app.FragmentManager; import android.support.v4.content.ContextCompat; +import android.support.v7.app.AlertDialog; +import android.support.v7.app.AlertDialog.Builder; import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatDelegate; import android.support.v7.widget.Toolbar; @@ -151,7 +151,7 @@ public class MainActivity extends AppCompatActivity implements TaskCallbacks, dialog.setArguments(bundle); dialog.setValueChangeListener(this); - dialog.show(getFragmentManager(), "number_picker"); + dialog.show(getSupportFragmentManager(), "number_picker"); break; } @@ -228,7 +228,7 @@ public class MainActivity extends AppCompatActivity implements TaskCallbacks, } private void startRecording() { - FragmentManager fragmentManager = getFragmentManager(); + FragmentManager fragmentManager = getSupportFragmentManager(); ListenerFragment listenerFragment = (ListenerFragment) fragmentManager.findFragmentByTag(TAG_LISTENER_FRAGMENT); diff --git a/app/src/main/java/com/github/cythara/NumberPickerDialog.java b/app/src/main/java/com/github/cythara/NumberPickerDialog.java @@ -1,9 +1,10 @@ package com.github.cythara; -import android.app.AlertDialog.Builder; import android.app.Dialog; import android.app.DialogFragment; import android.os.Bundle; +import android.support.v4.app.FragmentManager; +import android.support.v7.app.AlertDialog.Builder; import android.view.ContextThemeWrapper; import com.shawnlin.numberpicker.NumberPicker; @@ -54,4 +55,7 @@ public class NumberPickerDialog extends DialogFragment { public void setValueChangeListener(NumberPicker.OnValueChangeListener valueChangeListener) { this.valueChangeListener = valueChangeListener; } + + public void show(FragmentManager supportFragmentManager, String number_picker) { + } }