Refined layouts

w2sv · w2sv · commit 49a820922fd5 · 2022-04-25T20:14:50.000+02:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/autocrop/activities/examination/fragments/viewpager/handler/ViewPagerHandler.kt b/app/src/main/java/com/autocrop/activities/examination/fragments/viewpager/handler/ViewPagerHandler.kt
@@ -111,7 +111,7 @@ class ViewPagerHandler(
 
         @SuppressLint("ClickableViewAccessibility")
         private inner class CropViewHolder(view: ImageView) : RecyclerView.ViewHolder(view) {
-            val cropView: ImageView = view.findViewById(R.id.slide_item_image_view_examination_activity)
+            val cropView: ImageView = view.findViewById(R.id.image_view_examination_view_pager)
 
             /**
              * Set onTouchListener through implementation of ImmersiveViewOnTouchListener
@@ -159,7 +159,7 @@ class ViewPagerHandler(
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CropViewHolder {
             return CropViewHolder(
                 LayoutInflater.from(parent.context)
-                    .inflate(R.layout.slide_item_container_examination_activity, parent, false)
+                    .inflate(R.layout.activity_examination_view_pager_image_view, parent, false)
                         as ImageView
             )
         }
diff --git a/app/src/main/java/com/autocrop/activities/main/fragments/about/AboutFragment.kt b/app/src/main/java/com/autocrop/activities/main/fragments/about/AboutFragment.kt
@@ -23,19 +23,34 @@ class AboutFragment: MainActivityFragment<ActivityMainFragmentAboutBinding>(){
         binding.trippyBrudinelettenImageView.setOnClickListener { it.animate(Techniques.Tada) }
 
         binding.w2svTv.setOnClickListener {
-            val viewIntent = Intent(
+            // WHOOPSIE DAISY! - view simply disappears after ZoomOutRight
+            // and has to be thus ZoomInRight'd back in
+            it.animate(Techniques.ZoomOutRight){
+                it.animate(Techniques.ZoomInRight)
+            }
+
+            startActivity(
+                Intent(
                 "android.intent.action.VIEW",
                 Uri.parse("http://github.com/w2sv")
+                )
             )
-            startActivity(viewIntent)
         }
     }
 }
 
-class VersionTextView(context: Context, attr: AttributeSet): ExtendedTextView(context, attr, R.string.version){
-    init { text = getString().format(BuildConfig.VERSION_NAME) }
+class VersionTextView(context: Context, attr: AttributeSet):
+    ExtendedTextView(context, attr, R.string.version){
+
+    init {
+        text = getString().format(BuildConfig.VERSION_NAME)
+
+        setOnClickListener { it.animate(Techniques.RubberBand) }
+    }
 }
 
-class CopyrightTextView(context: Context, attr: AttributeSet): ExtendedTextView(context, attr, R.string.copyright){
+class CopyrightTextView(context: Context, attr: AttributeSet):
+    ExtendedTextView(context, attr, R.string.copyright){
+
     init { text = getString().format(Calendar.getInstance().get(Calendar.YEAR)) }
 }
diff --git a/app/src/main/java/com/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt b/app/src/main/java/com/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt
@@ -42,8 +42,7 @@ class FlowFieldFragment:
         flowFieldBinding.setCaptureButton(binding.flowfieldCaptureButton, permissionsHandler)
 
         // display CropIOResultSnackbar upon activity entry
-        if (savedInstanceState == null)
-            displayActivityEntrySnackbar()
+        displayActivityEntrySnackbar()
     }
 
     private val nSavedCropsRetriever = IntentExtraRetriever<IntArray>(IntentExtraIdentifier.N_SAVED_CROPS_WITH_N_DELETED_SCREENSHOTS)
diff --git a/app/src/main/res/drawable/gradient_background_main.xml b/app/src/main/res/drawable/gradient_background_main.xml
@@ -6,7 +6,7 @@
                 android:angle="270"
                 android:type="linear"
 
-                android:startColor="#000000"
+                android:startColor="@color/ocean_blue"
                 android:endColor="@color/magenta" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/progress_bar_cropping_activity_progress.xml b/app/src/main/res/drawable/progress_bar_cropping_activity_progress.xml
@@ -6,9 +6,8 @@
                 <corners android:radius="50dip" />
 
                 <gradient
-                    android:startColor="@color/magenta"
-                    android:endColor="@color/light_green"
-                    android:angle="180"/>
+                    android:startColor="@color/light_green"
+                    android:endColor="@color/saturated_magenta"/>
             </shape>
         </clip>
     </item>
diff --git a/app/src/main/res/drawable/splash_screen.xml b/app/src/main/res/drawable/splash_screen.xml
@@ -2,7 +2,7 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:drawable="@drawable/gradient_about_screen_background"/>
+        android:drawable="@drawable/gradient_background_main"/>
 
     <item
         android:drawable="@drawable/trippy_brudineletten"
diff --git a/app/src/main/res/layout/activity_cropping_fragment_root.xml b/app/src/main/res/layout/activity_cropping_fragment_root.xml
@@ -26,7 +26,6 @@
         android:layout_marginEnd="10dp"
         android:layout_marginStart="10dp"
 
-        android:progress="0"
         android:progressDrawable="@drawable/progress_bar_cropping_activity_progress"/>
 
     <com.autocrop.activities.cropping.fragments.cropping.CurrentImageNumberTextView
diff --git a/app/src/main/res/layout/activity_examination_fragment_viewpager.xml b/app/src/main/res/layout/activity_examination_fragment_viewpager.xml
@@ -25,7 +25,7 @@
             android:background="@android:color/transparent"
             android:text="@string/discard_all_button"
             android:textStyle="bold"
-            android:textColor="@color/dark_green"
+            android:textColor="@color/light_gray"
             android:translationX="-10dp" />
 
         <!-- Save All -->
@@ -38,7 +38,7 @@
             android:background="@android:color/transparent"
             android:text="@string/save_all_button"
             android:textStyle="bold"
-            android:textColor="@color/dark_green"
+            android:textColor="@color/light_gray"
             android:translationX="-10dp"/>
 
     </androidx.appcompat.widget.Toolbar>
@@ -133,6 +133,7 @@
         android:layout_marginHorizontal="30dp"
 
         android:textSize="13sp"
+        android:textColor="@color/light_gray"
 
         android:visibility="invisible"/>
 
diff --git a/app/src/main/res/layout/activity_examination_view_pager_image_view.xml b/app/src/main/res/layout/activity_examination_view_pager_image_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.widget.ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/slide_item_image_view_examination_activity"
+    android:id="@+id/image_view_examination_view_pager"
 
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_main_fragment_about.xml b/app/src/main/res/layout/activity_main_fragment_about.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
 
-    android:background="@drawable/gradient_about_screen_background">
+    android:background="@drawable/gradient_background_main">
 
     <TextView
         android:id="@+id/app_title_text_view"
@@ -55,7 +55,7 @@
 
         android:text="@string/w2sv"
         android:textSize="32sp"
-        android:textColor="@color/light_green"
+        android:textColor="@android:color/holo_purple"
         android:textStyle="italic">
 
     </TextView>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -4,7 +4,9 @@
 
     <color name="light_green">#008577</color>
     <color name="dark_green">#00574B</color>
-    <color name="leef_green">#0ca63c</color>
+    <color name="leaf_green">#0ca63c</color>
+
+    <color name="ocean_blue">#1a0ac7</color>
 
     <color name="brudi_pink">#FF3F7F</color>
     <color name="saturated_magenta">#911945</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -32,7 +32,7 @@
         <item name="android:textSize">42sp</item>
         <item name="android:text">@string/app_title</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/magenta</item>
+        <item name="android:textColor">@color/saturated_magenta</item>
     </style>
 
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ class FlowFieldFragment:`
`42`	`42`	`flowFieldBinding.setCaptureButton(binding.flowfieldCaptureButton, permissionsHandler)`
`43`	`43`
`44`	`44`	`// display CropIOResultSnackbar upon activity entry`
`45`		`- if (savedInstanceState == null)`
`46`		`- displayActivityEntrySnackbar()`
	`45`	`+ displayActivityEntrySnackbar()`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`private val nSavedCropsRetriever = IntentExtraRetriever<IntArray>(IntentExtraIdentifier.N_SAVED_CROPS_WITH_N_DELETED_SCREENSHOTS)`