add: Более, менее рабочая версия

rolling-scopes-school · aleh-god · Jun 19, 2021 · Jun 19, 2021 · Jun 20, 2021 · Jun 21, 2021
commit a7f3b856bbef0a63c94b2c356a12cb1819a6e20c
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,8 +8,7 @@
         android:label="Quiz"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Quiz.First">
-        <activity android:name=".ResultActivity"></activity>
+        android:theme="@style/Theme.Quiz.Purple">
         <activity
             android:name=".MainActivity"
             android:screenOrientation="portrait">
@@ -19,6 +18,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ResultActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Style.Quiz.Purple" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/rsschool/quiz/BlankFragment.kt b/app/src/main/java/com/rsschool/quiz/BlankFragment.kt
@@ -34,13 +34,7 @@ class BlankFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
 
-        // я просто создал массив R.style и загружал просто при каждом переключении
-        // context?.setTheme(id)
-
-        // цвет выдергивал в onCreateView до inflate. А цвет менял в методе viewPager.registerOnPageChangeCallback(object:ViewPager2.OnPageChangeCallback(){
-        //            override fun onPageSelected(position: Int) {}}
-        //этот метод выполняется при смене страницы и в position передается номер страницы
-
+        // activity?.theme?.applyStyle(R.style.Theme_Quiz_Purple, true)
 
         // return inflater.inflate(R.layout.fragment_blank, container, false)
         _binding = FragmentQuizBinding.inflate(inflater, container, false)
@@ -61,6 +55,29 @@ class BlankFragment : Fragment() {
             // Общее для всех функций свойство класса
             tempInt = quizObject.numberQuestion
 
+            when (tempInt) {
+                1 -> {
+                    activity?.theme?.applyStyle(R.style.Theme_Quiz_Purple, true)
+                    // activity?.window?.statusBarColor = resources.getColor(R.color.secondaryDarkColorPurple)
+                }
+                2 -> {
+                    activity?.theme?.applyStyle(R.style.Theme_Quiz_Blue, true)
+                    // activity?.window?.statusBarColor = resources.getColor(R.color.secondaryDarkColorBlue)
+                }
+                3 -> {
+                    activity?.theme?.applyStyle(R.style.Theme_Quiz_Green, true)
+                    // activity?.window?.statusBarColor = resources.getColor(R.color.secondaryDarkColorGreen)
+                }
+                4 -> {
+                    activity?.theme?.applyStyle(R.style.Theme_Quiz_Yellow, true)
+                    // activity?.window?.statusBarColor = resources.getColor(R.color.secondaryDarkColorYellow)
+                }
+                5 -> {
+                    activity?.theme?.applyStyle(R.style.Theme_Quiz_Orange, true)
+                    // activity?.window?.statusBarColor = resources.getColor(R.color.secondaryDarkColorOrange)
+                }
+            }
+
             binding.question.text = quizObject.question
             binding.optionOne.text = quizObject.answers[0]
             binding.optionTwo.text = quizObject.answers[1]

diff --git a/app/src/main/java/com/rsschool/quiz/DataObjectAccess.kt b/app/src/main/java/com/rsschool/quiz/DataObjectAccess.kt
@@ -11,6 +11,10 @@ class DataObjectAccess {
         numAnswers[numberQuest] = numberAnswer
     }
 
+    fun countAnswer(): Int {
+        return numAnswers.size
+    }
+
     fun getResultMessage(): User {
         var result = 0
         var history = "История вопросов и ответов.\n"

diff --git a/app/src/main/java/com/rsschool/quiz/MainActivity.kt b/app/src/main/java/com/rsschool/quiz/MainActivity.kt
@@ -17,6 +17,7 @@ public class MainActivity : FragmentActivity(), ActionListener {
     // Ресурсы
     private lateinit var binding: ActivityMainBinding
     private val dataQuiz = DataObjectAccess()
+    // private val position = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -40,6 +41,7 @@ public class MainActivity : FragmentActivity(), ActionListener {
 
     override fun nextFragment() {
         ++viewPager.currentItem
+        // viewPager.isUserInputEnabled = false
     }
 
     override fun backFragment() {

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -17,4 +17,59 @@
     <color name="deep_purple_100">#d1c4e9</color>
     <color name="deep_purple_100_light">#fff7ff</color>
     <color name="deep_purple_100_dark">#a094b7</color>
+
+    <color name="primaryColor">#ff7043</color>
+    <color name="primaryLightColor">#ffa270</color>
+    <color name="primaryDarkColor">#c63f17</color>
+    <color name="secondaryColor">#e64a19</color>
+    <color name="secondaryLightColor">#ff7d47</color>
+    <color name="secondaryDarkColor">#ac0800</color>
+    <color name="primaryTextColor">#000000</color>
+    <color name="secondaryTextColor">#000000</color>
+
+    <color name="primaryColorOrange">#ffa726</color>
+    <color name="primaryLightColorOrange">#ffd95b</color>
+    <color name="primaryDarkColorOrange">#c77800</color>
+    <color name="secondaryColorOrange">#f57c00</color>
+    <color name="secondaryLightColorOrange">#ffad42</color>
+    <color name="secondaryDarkColorOrange">#bb4d00</color>
+    <color name="primaryTextColorOrange">#000000</color>
+    <color name="secondaryTextColorOrange">#000000</color>
+
+    <color name="primaryColorYellow">#ffee58</color>
+    <color name="primaryLightColorYellow">#ffff8b</color>
+    <color name="primaryDarkColorYellow">#c9bc1f</color>
+    <color name="secondaryColorYellow">#fbc02d</color>
+    <color name="secondaryLightColorYellow">#fff263</color>
+    <color name="secondaryDarkColorYellow">#c49000</color>
+    <color name="primaryTextColorYellow">#000000</color>
+    <color name="secondaryTextColorYellow">#000000</color>
+
+    <color name="primaryColorGreen">#66bb6a</color>
+    <color name="primaryLightColorGreen">#98ee99</color>
+    <color name="primaryDarkColorGreen">#338a3e</color>
+    <color name="secondaryColorGreen">#388e3c</color>
+    <color name="secondaryLightColorGreen">#6abf69</color>
+    <color name="secondaryDarkColorGreen">#00600f</color>
+    <color name="primaryTextColorGreen">#000000</color>
+    <color name="secondaryTextColorGreen">#000000</color>
+
+    <color name="primaryColorBlue">#42a5f5</color>
+    <color name="primaryLightColorBlue">#80d6ff</color>
+    <color name="primaryDarkColorBlue">#0077c2</color>
+    <color name="secondaryColorBlue">#1976d2</color>
+    <color name="secondaryLightColorBlue">#63a4ff</color>
+    <color name="secondaryDarkColorBlue">#004ba0</color>
+    <color name="primaryTextColorBlue">#000000</color>
+    <color name="secondaryTextColorBlue">#ffffff</color>
+
+    <color name="primaryColorPurple">#ab47bc</color>
+    <color name="primaryLightColorPurple">#df78ef</color>
+    <color name="primaryDarkColorPurple">#790e8b</color>
+    <color name="secondaryColorPurple">#7b1fa2</color>
+    <color name="secondaryLightColorPurple">#ae52d4</color>
+    <color name="secondaryDarkColorPurple">#4a0072</color>
+    <color name="primaryTextColorPurple">#ffffff</color>
+    <color name="secondaryTextColorPurple">#ffffff</color>
+
 </resources>
diff --git a/app/src/main/res/values/myThemes.xml b/app/src/main/res/values/myThemes.xml
@@ -0,0 +1,53 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="Theme.Quiz.Purple" parent="Theme.Quiz">
+        <item name="colorPrimary">@color/primaryColorPurple</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorPurple</item>
+        <item name="colorPrimaryVariant">@color/primaryLightColorPurple</item>
+        <item name="colorSecondary">@color/secondaryColorPurple</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColorPurple</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/secondaryDarkColorPurple</item>
+    </style>
+
+    <style name="Theme.Quiz.Orange" parent="Theme.Quiz">
+        <item name="colorPrimary">@color/primaryColorOrange</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorOrange</item>
+        <item name="colorPrimaryVariant">@color/primaryLightColorOrange</item>
+        <item name="colorSecondary">@color/secondaryColorOrange</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColorOrange</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/secondaryDarkColorOrange</item>
+    </style>
+
+    <style name="Theme.Quiz.Yellow" parent="Theme.Quiz">
+        <item name="colorPrimary">@color/primaryColorYellow</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorYellow</item>
+        <item name="colorPrimaryVariant">@color/primaryLightColorYellow</item>
+        <item name="colorSecondary">@color/secondaryColorYellow</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColorYellow</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/secondaryDarkColorYellow</item>
+    </style>
+
+    <style name="Theme.Quiz.Blue" parent="Theme.Quiz">
+        <item name="colorPrimary">@color/primaryColorBlue</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorBlue</item>
+        <item name="colorPrimaryVariant">@color/primaryLightColorBlue</item>
+        <item name="colorSecondary">@color/secondaryColorBlue</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColorBlue</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/secondaryDarkColorBlue</item>
+    </style>
+
+    <style name="Theme.Quiz.Green" parent="Theme.Quiz">
+        <item name="colorPrimary">@color/primaryColorGreen</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorGreen</item>
+        <item name="colorPrimaryVariant">@color/primaryLightColorGreen</item>
+        <item name="colorSecondary">@color/secondaryColorGreen</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColorGreen</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/secondaryDarkColorGreen</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
@@ -1,2 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+
+    <style name="Style.Quiz.Purple" parent="Theme.Quiz">
+        <item name="colorPrimary">@color/primaryColorPurple</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorPurple</item>
+        <item name="colorPrimaryVariant">@color/primaryLightColorPurple</item>
+        <item name="colorSecondary">@color/secondaryColorPurple</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColorPurple</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/secondaryDarkColorPurple</item>
+    </style>
+
+    <style name="Style.Quiz.Orange" parent="Theme.Quiz">
+        <item name="colorPrimary">@color/primaryColorOrange</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorOrange</item>
+        <item name="colorPrimaryVariant">@color/primaryLightColorOrange</item>
+        <item name="colorSecondary">@color/secondaryColorOrange</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColorOrange</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/secondaryDarkColorOrange</item>
+    </style>
+
+    <style name="Style.Quiz.Yellow" parent="Theme.Quiz">
+        <item name="colorPrimary">@color/primaryColor</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColor</item>
+        <item name="colorPrimaryVariant">@color/primaryLightColor</item>
+        <item name="colorSecondary">@color/secondaryColor</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColor</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/secondaryDarkColor</item>
+    </style>
+
+    <style name="Style.Quiz.Blue" parent="Theme.Quiz">
+        <item name="colorPrimary">@color/primaryColorBlue</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorBlue</item>
+        <item name="colorPrimaryVariant">@color/primaryLightColorBlue</item>
+        <item name="colorSecondary">@color/secondaryColorBlue</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColorBlue</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/secondaryDarkColorBlue</item>
+    </style>
+
+    <style name="Style.Quiz.Green" parent="Theme.Quiz">
+        <item name="colorPrimary">@color/primaryColorGreen</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColorGreen</item>
+        <item name="colorPrimaryVariant">@color/primaryLightColorGreen</item>
+        <item name="colorSecondary">@color/secondaryColorGreen</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColorGreen</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/secondaryDarkColorGreen</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -24,4 +24,5 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@color/yellow_100_dark</item>
     </style>
+
 </resources>