App Introduction Improvements (amahi#555)

* Move to AppIntro2 * Optimize imports
chirag-jn · Jul 7, 2020 · adad44d · adad44d
1 parent 99e75d9
commit adad44d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 198 deletions.
diff --git a/src/main/java/org/amahi/anywhere/activity/IntroductionActivity.java b/src/main/java/org/amahi/anywhere/activity/IntroductionActivity.java
@@ -27,26 +27,26 @@
 import androidx.fragment.app.Fragment;
 import androidx.core.content.ContextCompat;
 
-import com.github.paolorotolo.appintro.AppIntro;
-import com.github.paolorotolo.appintro.AppIntroFragment;
+import com.github.paolorotolo.appintro.AppIntro2;
+import com.github.paolorotolo.appintro.AppIntro2Fragment;
 
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.util.CheckTV;
 import org.amahi.anywhere.util.LocaleHelper;
 import org.amahi.anywhere.util.Preferences;
-import org.amahi.anywhere.util.SampleSlide;
 
-public class IntroductionActivity extends AppIntro {
+public class IntroductionActivity extends AppIntro2 {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        addSlide(SampleSlide.newInstance(R.layout.intro_first_layout));
-        addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_2), getString(R.string.intro_desc_2), R.drawable.network, ContextCompat.getColor(this, R.color.intro_2)));
-        addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_3), getString(R.string.intro_desc_phone_3), R.drawable.photos, Color.DKGRAY));
-        addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_4), getString(R.string.intro_desc_phone_4), R.drawable.music, ContextCompat.getColor(this, R.color.intro_4)));
-        addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_5), getString(R.string.intro_desc_phone_5), R.drawable.movies, ContextCompat.getColor(this, R.color.intro_5)));
-        addSlide(AppIntroFragment.newInstance(getString(R.string.intro_title_6), getString(R.string.intro_desc_6), R.drawable.tick, ContextCompat.getColor(this, R.color.intro_6)));
-        setFlowAnimation();
+        addSlide(AppIntro2Fragment.newInstance(getString(R.string.intro_phone_1), getString(R.string.intro_desc_phone_1), R.drawable.ic_banner_white, ContextCompat.getColor(this, R.color.intro_1)));
+        addSlide(AppIntro2Fragment.newInstance(getString(R.string.intro_title_2), getString(R.string.intro_desc_2), R.drawable.network, ContextCompat.getColor(this, R.color.intro_2)));
+        addSlide(AppIntro2Fragment.newInstance(getString(R.string.intro_title_3), getString(R.string.intro_desc_phone_3), R.drawable.photos, Color.DKGRAY));
+        addSlide(AppIntro2Fragment.newInstance(getString(R.string.intro_title_4), getString(R.string.intro_desc_phone_4), R.drawable.music, ContextCompat.getColor(this, R.color.intro_4)));
+        addSlide(AppIntro2Fragment.newInstance(getString(R.string.intro_title_5), getString(R.string.intro_desc_phone_5), R.drawable.movies, ContextCompat.getColor(this, R.color.intro_5)));
+        addSlide(AppIntro2Fragment.newInstance(getString(R.string.intro_title_6), getString(R.string.intro_desc_6), R.drawable.tick, ContextCompat.getColor(this, R.color.intro_6)));
+        setColorTransitionsEnabled(true);
+        setFadeAnimation();
     }
 
     @Override

diff --git a/src/main/java/org/amahi/anywhere/util/SampleSlide.java b/src/main/java/org/amahi/anywhere/util/SampleSlide.java
diff --git a/src/main/res/layout-land/intro_first_layout.xml b/src/main/res/layout-land/intro_first_layout.xml
diff --git a/src/main/res/layout/intro_first_layout.xml b/src/main/res/layout/intro_first_layout.xml
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
@@ -144,7 +144,7 @@
 
     <!--Introduction TV activity strings-->
     <string name="intro_tv_1">Bienvenue à Amahi pour Android TV</string>
-    <string name="intro_phone_1">Bienvenue à Amahi pour Android.</string>
+    <string name="intro_phone_1">Bienvenue à Amahi pour Android</string>
     <string name="intro_desc_phone_1">Une app Android qui vous permet d\'accéder à vos fichiers dans votre Amahi Home Server.</string>
 
     <string name="intro_title_2">Accéder à votre HDA</string>

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -151,7 +151,7 @@
 
     <!--Introduction TV activity strings-->
     <string name="intro_tv_1">Welcome to Amahi for Android TV</string>
-    <string name="intro_phone_1">Welcome to Amahi for Android.</string>
+    <string name="intro_phone_1">Welcome to Amahi for Android</string>
     <string name="intro_desc_phone_1">An Android app that lets you access the files in your Amahi Home Server.</string>
 
     <string name="intro_title_2">Access your HDA</string>