diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java index 024ca6aeb..b24190996 100644 --- a/app/src/main/java/protect/card_locker/MainActivity.java +++ b/app/src/main/java/protect/card_locker/MainActivity.java @@ -34,7 +34,6 @@ import com.google.common.collect.ImmutableMap; import java.util.Calendar; import java.util.Map; -import protect.card_locker.intro.IntroActivity; import protect.card_locker.preferences.SettingsActivity; public class MainActivity extends AppCompatActivity @@ -54,12 +53,6 @@ public class MainActivity extends AppCompatActivity setSupportActionBar(toolbar); updateLoyaltyCardList(""); - - SharedPreferences prefs = getSharedPreferences("protect.card_locker", MODE_PRIVATE); - if (prefs.getBoolean("firstrun", true)) { - startIntro(); - prefs.edit().putBoolean("firstrun", false).commit(); - } } @Override @@ -280,12 +273,6 @@ public class MainActivity extends AppCompatActivity return true; } - if(id == R.id.action_intro) - { - startIntro(); - return true; - } - if(id == R.id.action_about) { displayAboutDialog(); @@ -393,10 +380,4 @@ public class MainActivity extends AppCompatActivity }) .show(); } - - private void startIntro() - { - Intent intent = new Intent(this, IntroActivity.class); - startActivityForResult(intent, MAIN_REQUEST_CODE); - } } \ No newline at end of file diff --git a/app/src/main/java/protect/card_locker/intro/IntroActivity.java b/app/src/main/java/protect/card_locker/intro/IntroActivity.java deleted file mode 100644 index 37a699ed8..000000000 --- a/app/src/main/java/protect/card_locker/intro/IntroActivity.java +++ /dev/null @@ -1,33 +0,0 @@ -package protect.card_locker.intro; - -import android.os.Bundle; -import androidx.fragment.app.Fragment; - -import com.github.paolorotolo.appintro.AppIntro; - - -public class IntroActivity extends AppIntro -{ - @Override - public void init(Bundle savedInstanceState) - { - addSlide(new IntroSlide1()); - addSlide(new IntroSlide2()); - addSlide(new IntroSlide3()); - addSlide(new IntroSlide4()); - addSlide(new IntroSlide5()); - addSlide(new IntroSlide6()); - } - - @Override - public void onSkipPressed(Fragment fragment) { - finish(); - } - - @Override - public void onDonePressed(Fragment fragment) { - finish(); - } -} - - diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide1.java b/app/src/main/java/protect/card_locker/intro/IntroSlide1.java deleted file mode 100644 index beecb43c3..000000000 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide1.java +++ /dev/null @@ -1,19 +0,0 @@ -package protect.card_locker.intro; - -import android.os.Bundle; -import androidx.fragment.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import protect.card_locker.R; - -public class IntroSlide1 extends Fragment -{ - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View v = inflater.inflate(R.layout.intro1_layout, container, false); - return v; - } -} diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide2.java b/app/src/main/java/protect/card_locker/intro/IntroSlide2.java deleted file mode 100644 index a1e652c51..000000000 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide2.java +++ /dev/null @@ -1,20 +0,0 @@ -package protect.card_locker.intro; - -import android.os.Bundle; -import androidx.fragment.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import protect.card_locker.R; - -public class IntroSlide2 extends Fragment -{ - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View v = inflater.inflate(R.layout.intro2_layout, container, false); - return v; - } -} diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide3.java b/app/src/main/java/protect/card_locker/intro/IntroSlide3.java deleted file mode 100644 index 5acc83e7b..000000000 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide3.java +++ /dev/null @@ -1,19 +0,0 @@ -package protect.card_locker.intro; - -import android.os.Bundle; -import androidx.fragment.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import protect.card_locker.R; - -public class IntroSlide3 extends Fragment -{ - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View v = inflater.inflate(R.layout.intro3_layout, container, false); - return v; - } -} diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide4.java b/app/src/main/java/protect/card_locker/intro/IntroSlide4.java deleted file mode 100644 index 1a7ad6e69..000000000 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide4.java +++ /dev/null @@ -1,19 +0,0 @@ -package protect.card_locker.intro; - -import android.os.Bundle; -import androidx.fragment.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import protect.card_locker.R; - -public class IntroSlide4 extends Fragment -{ - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View v = inflater.inflate(R.layout.intro4_layout, container, false); - return v; - } -} diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide5.java b/app/src/main/java/protect/card_locker/intro/IntroSlide5.java deleted file mode 100644 index ab3b5b757..000000000 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide5.java +++ /dev/null @@ -1,19 +0,0 @@ -package protect.card_locker.intro; - -import android.os.Bundle; -import androidx.fragment.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import protect.card_locker.R; - -public class IntroSlide5 extends Fragment -{ - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View v = inflater.inflate(R.layout.intro5_layout, container, false); - return v; - } -} diff --git a/app/src/main/java/protect/card_locker/intro/IntroSlide6.java b/app/src/main/java/protect/card_locker/intro/IntroSlide6.java deleted file mode 100644 index 217967844..000000000 --- a/app/src/main/java/protect/card_locker/intro/IntroSlide6.java +++ /dev/null @@ -1,19 +0,0 @@ -package protect.card_locker.intro; - -import android.os.Bundle; -import androidx.fragment.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import protect.card_locker.R; - -public class IntroSlide6 extends Fragment -{ - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View v = inflater.inflate(R.layout.intro6_layout, container, false); - return v; - } -} diff --git a/app/src/main/res/drawable-hdpi/app_icon_intro.png b/app/src/main/res/drawable-hdpi/app_icon_intro.png deleted file mode 100755 index 11c0465c6..000000000 Binary files a/app/src/main/res/drawable-hdpi/app_icon_intro.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/intro2_image.png b/app/src/main/res/drawable-hdpi/intro2_image.png deleted file mode 100644 index 6a718057d..000000000 Binary files a/app/src/main/res/drawable-hdpi/intro2_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/intro3_image.png b/app/src/main/res/drawable-hdpi/intro3_image.png deleted file mode 100644 index 529e99c12..000000000 Binary files a/app/src/main/res/drawable-hdpi/intro3_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/intro4_image.png b/app/src/main/res/drawable-hdpi/intro4_image.png deleted file mode 100644 index d81adbf47..000000000 Binary files a/app/src/main/res/drawable-hdpi/intro4_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/intro5_image.png b/app/src/main/res/drawable-hdpi/intro5_image.png deleted file mode 100644 index b508ce888..000000000 Binary files a/app/src/main/res/drawable-hdpi/intro5_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/app_icon_intro.png b/app/src/main/res/drawable-mdpi/app_icon_intro.png deleted file mode 100755 index 1336339d8..000000000 Binary files a/app/src/main/res/drawable-mdpi/app_icon_intro.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/intro2_image.png b/app/src/main/res/drawable-mdpi/intro2_image.png deleted file mode 100644 index ec3dd8c9f..000000000 Binary files a/app/src/main/res/drawable-mdpi/intro2_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/intro3_image.png b/app/src/main/res/drawable-mdpi/intro3_image.png deleted file mode 100644 index 69b1136ce..000000000 Binary files a/app/src/main/res/drawable-mdpi/intro3_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/intro4_image.png b/app/src/main/res/drawable-mdpi/intro4_image.png deleted file mode 100644 index 48094b799..000000000 Binary files a/app/src/main/res/drawable-mdpi/intro4_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/intro5_image.png b/app/src/main/res/drawable-mdpi/intro5_image.png deleted file mode 100644 index 561de1d24..000000000 Binary files a/app/src/main/res/drawable-mdpi/intro5_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/app_icon_intro.png b/app/src/main/res/drawable-xhdpi/app_icon_intro.png deleted file mode 100755 index 21b1cbdcf..000000000 Binary files a/app/src/main/res/drawable-xhdpi/app_icon_intro.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/intro2_image.png b/app/src/main/res/drawable-xhdpi/intro2_image.png deleted file mode 100644 index 3fc205679..000000000 Binary files a/app/src/main/res/drawable-xhdpi/intro2_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/intro3_image.png b/app/src/main/res/drawable-xhdpi/intro3_image.png deleted file mode 100644 index 452ff2232..000000000 Binary files a/app/src/main/res/drawable-xhdpi/intro3_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/intro4_image.png b/app/src/main/res/drawable-xhdpi/intro4_image.png deleted file mode 100644 index 0f6bb3c49..000000000 Binary files a/app/src/main/res/drawable-xhdpi/intro4_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/intro5_image.png b/app/src/main/res/drawable-xhdpi/intro5_image.png deleted file mode 100644 index e5424a264..000000000 Binary files a/app/src/main/res/drawable-xhdpi/intro5_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/app_icon_intro.png b/app/src/main/res/drawable-xxhdpi/app_icon_intro.png deleted file mode 100755 index 37d6ee852..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/app_icon_intro.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/intro2_image.png b/app/src/main/res/drawable-xxhdpi/intro2_image.png deleted file mode 100644 index 4d007849b..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/intro2_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/intro3_image.png b/app/src/main/res/drawable-xxhdpi/intro3_image.png deleted file mode 100644 index d96045d4c..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/intro3_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/intro4_image.png b/app/src/main/res/drawable-xxhdpi/intro4_image.png deleted file mode 100644 index 52addc5b8..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/intro4_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/intro5_image.png b/app/src/main/res/drawable-xxhdpi/intro5_image.png deleted file mode 100644 index 9907b40c9..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/intro5_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/app_icon_intro.png b/app/src/main/res/drawable-xxxhdpi/app_icon_intro.png deleted file mode 100755 index 9385319fb..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/app_icon_intro.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/intro2_image.png b/app/src/main/res/drawable-xxxhdpi/intro2_image.png deleted file mode 100644 index 0380b6056..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/intro2_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/intro3_image.png b/app/src/main/res/drawable-xxxhdpi/intro3_image.png deleted file mode 100644 index 1bfcde5e2..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/intro3_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/intro4_image.png b/app/src/main/res/drawable-xxxhdpi/intro4_image.png deleted file mode 100644 index 3dbaed62d..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/intro4_image.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/intro5_image.png b/app/src/main/res/drawable-xxxhdpi/intro5_image.png deleted file mode 100644 index 2a929fec2..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/intro5_image.png and /dev/null differ diff --git a/app/src/main/res/layout/intro1_layout.xml b/app/src/main/res/layout/intro1_layout.xml deleted file mode 100644 index 9cfe98263..000000000 --- a/app/src/main/res/layout/intro1_layout.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/intro2_layout.xml b/app/src/main/res/layout/intro2_layout.xml deleted file mode 100644 index 608be6857..000000000 --- a/app/src/main/res/layout/intro2_layout.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/intro3_layout.xml b/app/src/main/res/layout/intro3_layout.xml deleted file mode 100644 index 5f327bc11..000000000 --- a/app/src/main/res/layout/intro3_layout.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/intro4_layout.xml b/app/src/main/res/layout/intro4_layout.xml deleted file mode 100644 index 30b7ae061..000000000 --- a/app/src/main/res/layout/intro4_layout.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/intro5_layout.xml b/app/src/main/res/layout/intro5_layout.xml deleted file mode 100644 index 29c29f9ed..000000000 --- a/app/src/main/res/layout/intro5_layout.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/intro6_layout.xml b/app/src/main/res/layout/intro6_layout.xml deleted file mode 100644 index 973b15b59..000000000 --- a/app/src/main/res/layout/intro6_layout.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index 5998c31e4..cf244f423 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -22,10 +22,6 @@ android:id="@+id/action_settings" android:title="@string/settings" app:showAsAction="never"/> -