Skip to content

Commit

Permalink
Switch to AppCompatActivity
Browse files Browse the repository at this point in the history
  • Loading branch information
sudonatalie committed Jul 6, 2020
1 parent 01f3dd3 commit 2ded5de
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ android {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.toptoche.searchablespinner:searchablespinnerlibrary:1.3.1'
implementation('org.jscience:jscience:4.3.1') {
exclude group: "org.javolution"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import android.widget.EditText;
import android.widget.Spinner;

import androidx.appcompat.app.AppCompatActivity;

import com.natalieperna.cupful.R;
import com.natalieperna.cupful.data.IngredientReader;
import com.natalieperna.cupful.data.Units;
Expand All @@ -26,7 +28,7 @@
import javax.measure.quantity.Quantity;
import javax.measure.unit.Unit;

public class MainActivity extends Activity {
public class MainActivity extends AppCompatActivity {

private boolean ignoreListeners = false;

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">

<style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorPrimaryDark">@color/primaryDark</item>
<item name="android:colorAccent">@color/accent</item>
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primaryDark</item>
<item name="colorAccent">@color/accent</item>
<item name="android:textSize">@dimen/bodyText</item>
<item name="android:textColor">@color/primaryText</item>
</style>
Expand Down

0 comments on commit 2ded5de

Please sign in to comment.