Add 5y range

premnirmal · Jul 30, 2022 · 25ffa76 · 25ffa76
1 parent 921b8c4
commit 25ffa76
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 2 deletions.
diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/base/BaseGraphActivity.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/base/BaseGraphActivity.kt
@@ -119,6 +119,7 @@ abstract class BaseGraphActivity<T : ViewBinding> : BaseActivity<T>() {
       R.id.one_month -> range = Range.ONE_MONTH
       R.id.three_month -> range = Range.THREE_MONTH
       R.id.one_year -> range = Range.ONE_YEAR
+      R.id.five_years -> range = Range.FIVE_YEARS
       R.id.max -> range = Range.MAX
     }
     fetchGraphData()

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/model/HistoryProvider.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/model/HistoryProvider.kt
@@ -2,6 +2,7 @@ package com.github.premnirmal.ticker.model
 
 import com.github.premnirmal.ticker.components.Injector
 import com.github.premnirmal.ticker.model.IHistoryProvider.Range
+import com.github.premnirmal.ticker.model.IHistoryProvider.Range.Companion.FIVE_YEARS
 import com.github.premnirmal.ticker.model.IHistoryProvider.Range.Companion.MAX
 import com.github.premnirmal.ticker.model.IHistoryProvider.Range.Companion.ONE_DAY
 import com.github.premnirmal.ticker.model.IHistoryProvider.Range.Companion.ONE_MONTH
@@ -103,6 +104,7 @@ class HistoryProvider : IHistoryProvider {
       ONE_MONTH -> "1mo"
       THREE_MONTH -> "3mo"
       ONE_YEAR -> "1y"
+      FIVE_YEARS -> "5y"
       MAX -> "max"
       else -> "max"
     }

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/model/IHistoryProvider.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/model/IHistoryProvider.kt
@@ -23,6 +23,7 @@ interface IHistoryProvider {
       val ONE_MONTH = DateRange(Duration.ofDays(30))
       val THREE_MONTH = DateRange(Duration.ofDays(90))
       val ONE_YEAR = DateRange(Duration.ofDays(365))
+      val FIVE_YEARS = DateRange(Duration.ofDays(5 * 365))
       val MAX = DateRange(Duration.ofDays(20 * 365))
     }
   }

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/news/GraphActivity.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/news/GraphActivity.kt
@@ -56,6 +56,7 @@ class GraphActivity : BaseGraphActivity<ActivityGraphBinding>() {
       Range.ONE_MONTH -> binding.oneMonth
       Range.THREE_MONTH -> binding.threeMonth
       Range.ONE_YEAR -> binding.oneYear
+      Range.FIVE_YEARS -> binding.fiveYears
       Range.MAX -> binding.max
       else -> throw UnsupportedOperationException("Range not supported")
     }

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/news/QuoteDetailActivity.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/news/QuoteDetailActivity.kt
@@ -172,6 +172,7 @@ class QuoteDetailActivity : BaseGraphActivity<ActivityQuoteDetailBinding>(), New
       Range.ONE_MONTH -> binding.oneMonth
       Range.THREE_MONTH -> binding.threeMonth
       Range.ONE_YEAR -> binding.oneYear
+      Range.FIVE_YEARS -> binding.fiveYears
       Range.MAX -> binding.max
       else -> throw UnsupportedOperationException("Range not supported")
     }

diff --git a/app/src/main/res/layout-land/activity_quote_detail.xml b/app/src/main/res/layout-land/activity_quote_detail.xml
@@ -198,6 +198,13 @@
           android:layout_height="wrap_content"
           android:text="@string/one_year_short"/>
 
+      <com.google.android.material.chip.Chip
+          android:id="@+id/five_years"
+          style="@style/Widget.Chip.Chart"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:text="@string/five_years_short"/>
+
       <com.google.android.material.chip.Chip
           android:id="@+id/max"
           style="@style/Widget.Chip.Chart"

diff --git a/app/src/main/res/layout-sw600dp-land/activity_quote_detail.xml b/app/src/main/res/layout-sw600dp-land/activity_quote_detail.xml
@@ -217,6 +217,13 @@
               android:layout_height="wrap_content"
               android:text="@string/one_year_short"/>
 
+          <com.google.android.material.chip.Chip
+              android:id="@+id/five_years"
+              style="@style/Widget.Chip.Chart"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/five_years_short"/>
+
           <com.google.android.material.chip.Chip
               android:id="@+id/max"
               style="@style/Widget.Chip.Chart"

diff --git a/app/src/main/res/layout/activity_graph.xml b/app/src/main/res/layout/activity_graph.xml
@@ -107,6 +107,13 @@
         android:layout_height="wrap_content"
         android:text="@string/one_year_short"/>
 
+    <com.google.android.material.chip.Chip
+        android:id="@+id/five_years"
+        style="@style/Widget.Chip.Chart"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/five_years_short"/>
+
     <com.google.android.material.chip.Chip
         android:id="@+id/max"
         style="@style/Widget.Chip.Chart"

diff --git a/app/src/main/res/layout/activity_quote_detail.xml b/app/src/main/res/layout/activity_quote_detail.xml
@@ -201,6 +201,13 @@
             android:layout_height="wrap_content"
             android:text="@string/one_year_short"/>
 
+        <com.google.android.material.chip.Chip
+            android:id="@+id/five_years"
+            style="@style/Widget.Chip.Chart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/five_years_short"/>
+
         <com.google.android.material.chip.Chip
             android:id="@+id/max"
             style="@style/Widget.Chip.Chart"

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -145,11 +145,13 @@
   <string name="one_month">1 Monat</string>
   <string name="three_month">3 Monate</string>
   <string name="one_year">1 Jahr</string>
+  <string name="five_years">5 Jahre</string>
   <string name="one_day_short">1D</string>
   <string name="two_weeks_short">14D</string>
   <string name="one_month_short">1M</string>
   <string name="three_month_short">3M</string>
   <string name="one_year_short">1Y</string>
+  <string name="five_years_short">5Y</string>
   <string name="max">Max</string>
   <string name="error_loading_graph">Fehler beim Laden des Diagramms</string>
   <string name="widgets">Widgets</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -143,11 +143,13 @@
   <string name="one_month">1 mes</string>
   <string name="three_month">3 meses</string>
   <string name="one_year">1 año</string>
+  <string name="five_years">5 años</string>
   <string name="one_day_short">1D</string>
   <string name="two_weeks_short">2S</string>
   <string name="one_month_short">1M</string>
   <string name="three_month_short">3M</string>
   <string name="one_year_short">1Y</string>
+  <string name="five_years_short">5Y</string>
   <string name="max">Max</string>
   <string name="error_loading_graph">Error al cargar los datos del gráfico</string>
   <string name="widgets">Widgets</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -144,11 +144,13 @@
   <string name="one_month">1 mois</string>
   <string name="three_month">3 mois</string>
   <string name="one_year">1 an</string>
+  <string name="five_years">5 an</string>
   <string name="one_day_short">1D</string>
   <string name="two_weeks_short">14D</string>
   <string name="one_month_short">1M</string>
   <string name="three_month_short">3M</string>
   <string name="one_year_short">1Y</string>
+  <string name="five_years_short">5Y</string>
   <string name="max">Max</string>
   <string name="error_loading_graph">Erreur de chargement du graphique</string>
   <string name="widgets">Widgets</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -145,11 +145,13 @@
   <string name="one_month">1 Mese</string>
   <string name="three_month">3 Mesi</string>
   <string name="one_year">1 Anno</string>
+  <string name="five_years">5 Anno</string>
   <string name="one_day_short">1G</string>
   <string name="two_weeks_short">14D</string>
   <string name="one_month_short">1M</string>
   <string name="three_month_short">3M</string>
   <string name="one_year_short">1A</string>
+  <string name="five_years_short">5A</string>
   <string name="max">Massimo</string>
   <string name="error_loading_graph">Errore caricamento grafico</string>
   <string name="widgets">Widget</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -156,11 +156,13 @@
   <string name="one_month">1 Month</string>
   <string name="three_month">3 Months</string>
   <string name="one_year">1 Year</string>
+  <string name="five_years">5 Years</string>
   <string name="one_day_short">1D</string>
   <string name="two_weeks_short">2W</string>
   <string name="one_month_short">1M</string>
   <string name="three_month_short">3M</string>
   <string name="one_year_short">1Y</string>
+  <string name="five_years_short">5Y</string>
   <string name="max">Max</string>
   <string name="error_loading_graph">Error loading graph</string>
   <string name="widgets">Widgets</string>

diff --git a/app/version.properties b/app/version.properties
@@ -1,3 +1,3 @@
 # this file is purely for f-droid because it cannot infer the version name/code from the git tag
-versionName=3.9.804
-versionCode=300900004
+versionName=3.9.805
+versionCode=300900005