Commit 98dd9491 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch 'Issue-2835_Implement_dark_mode' into 'master'

2835-P,Q-Dark mode implementation

See merge request !62
parents ca5c2507 123b2379
Pipeline #120643 passed with stage
in 5 minutes and 26 seconds
No preview for this file type
......@@ -119,8 +119,6 @@ class ApplicationActivity :
}
// Set accent color
binding.installButtonLayout.appInstall.setTextColor(Color.parseColor("#ffffff"))
binding.installButtonLayout.appInstall.background.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.SRC_IN)
binding.appDownloadProgress.progressDrawable.colorFilter = PorterDuffColorFilter(accentColorOS, PorterDuff.Mode.SRC_IN)
binding.appCategory.setTextColor(accentColorOS)
binding.appExpandDescription.setTextColor(accentColorOS)
......@@ -205,7 +203,7 @@ class ApplicationActivity :
private fun textColorChange(text: String): SpannableStringBuilder {
val builder = SpannableStringBuilder();
val redSpannable = SpannableString(text);
redSpannable.setSpan(ForegroundColorSpan(R.color.colorDarkGray), 0, text.length, 0);
redSpannable.setSpan(ForegroundColorSpan(R.color.colorTextSecondary), 0, text.length, 0);
builder.append(redSpannable);
return builder
}
......
......@@ -17,7 +17,6 @@
package foundation.e.apps.categories
import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
......@@ -42,9 +41,6 @@ class CategoriesFragment : Fragment() {
viewPager.adapter = CategoriesViewPagerAdapter(requireActivity().supportFragmentManager, tabLayout.tabCount, color)
viewPager.addOnPageChangeListener(TabLayout.TabLayoutOnPageChangeListener(tabLayout))
tabLayout.setSelectedTabIndicatorColor(color);
tabLayout.setTabTextColors(Color.parseColor("#000000"), color);
tabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
override fun onTabSelected(tab: TabLayout.Tab) {
viewPager.currentItem = tab.position
......
......@@ -117,7 +117,7 @@ class SearchFragment : Fragment(), SearchView.OnQueryTextListener, SearchView.On
val from = arrayOf(SUGGESTION_KEY)
val to = intArrayOf(android.R.id.text1)
searchView.suggestionsAdapter = SimpleCursorAdapter(context,
android.R.layout.simple_list_item_1, null, from, to,
R.layout.custom_simple_list_item, null, from, to,
CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER)
// Initialise recycler view
......
......@@ -21,6 +21,6 @@
<stroke
android:width="1dp"
android:color="@color/colorBorder"
android:color="@color/colorAccent"
/>
</shape>
\ No newline at end of file
......@@ -21,6 +21,6 @@
android:viewportWidth="512"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M435.848,83.466L172.804,346.51l-96.652,-96.652c-4.686,-4.686 -12.284,-4.686 -16.971,0l-28.284,28.284c-4.686,4.686 -4.686,12.284 0,16.971l133.421,133.421c4.686,4.686 12.284,4.686 16.971,0l299.813,-299.813c4.686,-4.686 4.686,-12.284 0,-16.971l-28.284,-28.284c-4.686,-4.686 -12.284,-4.686 -16.97,0z"/>
</vector>
......@@ -18,7 +18,7 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="512dp"
android:height="512dp"
android:tint="@color/color_category_icon"
android:tint="@color/colorAccent"
android:viewportWidth="512"
android:viewportHeight="512">
<group
......@@ -27,7 +27,7 @@
android:scaleX="0.5"
android:scaleY="0.5">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M304,256c0,26.5 -21.5,48 -48,48s-48,-21.5 -48,-48 21.5,-48 48,-48 48,21.5 48,48zM424,208c-26.5,0 -48,21.5 -48,48s21.5,48 48,48 48,-21.5 48,-48 -21.5,-48 -48,-48zM88,208c-26.5,0 -48,21.5 -48,48s21.5,48 48,48 48,-21.5 48,-48 -21.5,-48 -48,-48z" />
</group>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="256"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M24.707,38.101L4.908,57.899c-4.686,4.686 -4.686,12.284 0,16.971L185.607,256 4.908,437.13c-4.686,4.686 -4.686,12.284 0,16.971L24.707,473.9c4.686,4.686 12.284,4.686 16.971,0l209.414,-209.414c4.686,-4.686 4.686,-12.284 0,-16.971L41.678,38.101c-4.687,-4.687 -12.285,-4.687 -16.971,0z"/>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="384"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M369.9,97.9L286,14C277,5 264.8,-0.1 252.1,-0.1H48C21.5,0 0,21.5 0,48v416c0,26.5 21.5,48 48,48h288c26.5,0 48,-21.5 48,-48V131.9c0,-12.7 -5.1,-25 -14.1,-34zM332.1,128H256V51.9l76.1,76.1zM48,464V48h160v104c0,13.3 10.7,24 24,24h104v288H48z"/>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="448"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M89.6,204.5v115.8c0,15.4 -12.1,27.7 -27.5,27.7 -15.3,0 -30.1,-12.4 -30.1,-27.7L32,204.5c0,-15.1 14.8,-27.5 30.1,-27.5 15.1,0 27.5,12.4 27.5,27.5zM100.4,361.5c0,16.4 13.2,29.6 29.6,29.6h19.9l0.3,61.1c0,36.9 55.2,36.6 55.2,0v-61.1h37.2v61.1c0,36.7 55.5,36.8 55.5,0v-61.1h20.2c16.2,0 29.4,-13.2 29.4,-29.6L347.7,182.1L100.4,182.1v179.4zM348.4,172.4L99.3,172.4c0,-42.8 25.6,-80 63.6,-99.4l-19.1,-35.3c-2.8,-4.9 4.3,-8 6.7,-3.8l19.4,35.6c34.9,-15.5 75,-14.7 108.3,0L297.5,34c2.5,-4.3 9.5,-1.1 6.7,3.8L285.1,73c37.7,19.4 63.3,56.6 63.3,99.4zM177.7,116.9c0,-5.7 -4.6,-10.5 -10.5,-10.5 -5.7,0 -10.2,4.8 -10.2,10.5s4.6,10.5 10.2,10.5c5.9,0 10.5,-4.8 10.5,-10.5zM291.1,116.9c0,-5.7 -4.6,-10.5 -10.2,-10.5 -5.9,0 -10.5,4.8 -10.5,10.5s4.6,10.5 10.5,10.5c5.6,0 10.2,-4.8 10.2,-10.5zM385.9,177c-15.1,0 -27.5,12.1 -27.5,27.5v115.8c0,15.4 12.4,27.7 27.5,27.7 15.4,0 30.1,-12.4 30.1,-27.7L416,204.5c0,-15.4 -14.8,-27.5 -30.1,-27.5z"/>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="640"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M272,80c53.473,0 99.279,32.794 118.426,79.363C401.611,149.793 416.125,144 432,144c35.346,0 64,28.654 64,64 0,11.829 -3.222,22.9 -8.817,32.407A96.998,96.998 0,0 1,496 240c53.019,0 96,42.981 96,96s-42.981,96 -96,96L160,432c-61.856,0 -112,-50.144 -112,-112 0,-56.428 41.732,-103.101 96.014,-110.859 -0.003,-0.381 -0.014,-0.76 -0.014,-1.141 0,-70.692 57.308,-128 128,-128m0,-48c-84.587,0 -155.5,59.732 -172.272,139.774C39.889,196.13 0,254.416 0,320c0,88.374 71.642,160 160,160h336c79.544,0 144,-64.487 144,-144 0,-61.805 -39.188,-115.805 -96.272,-135.891C539.718,142.116 491.432,96 432,96c-7.558,0 -15.051,0.767 -22.369,2.262C377.723,58.272 328.091,32 272,32zM312,420L312,232.535l54.545,55.762c4.671,4.775 12.341,4.817 17.064,0.094l16.877,-16.877c4.686,-4.686 4.686,-12.284 0,-16.971l-104,-104c-4.686,-4.686 -12.284,-4.686 -16.971,0l-104,104c-4.686,4.686 -4.686,12.284 0,16.971l16.877,16.877c4.723,4.723 12.393,4.681 17.064,-0.094L264,232.535L264,372c0,6.627 5.373,12 12,12h24c6.627,0 12,-5.373 12,-12z"/>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="384"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M384,144c0,-44.2 -35.8,-80 -80,-80s-80,35.8 -80,80c0,36.4 24.3,67.1 57.5,76.8 -0.6,16.1 -4.2,28.5 -11,36.9 -15.4,19.2 -49.3,22.4 -85.2,25.7 -28.2,2.6 -57.4,5.4 -81.3,16.9v-144c32.5,-10.2 56,-40.5 56,-76.3 0,-44.2 -35.8,-80 -80,-80S0,35.8 0,80c0,35.8 23.5,66.1 56,76.3v199.3C23.5,365.9 0,396.2 0,432c0,44.2 35.8,80 80,80s80,-35.8 80,-80c0,-34 -21.2,-63.1 -51.2,-74.6 3.1,-5.2 7.8,-9.8 14.9,-13.4 16.2,-8.2 40.4,-10.4 66.1,-12.8 42.2,-3.9 90,-8.4 118.2,-43.5 14,-17.4 21.1,-39.8 21.6,-67.9 31.6,-10.7 54.4,-40.6 54.4,-75.8zM80,48c17.6,0 32,14.4 32,32s-14.4,32 -32,32 -32,-14.4 -32,-32 14.4,-32 32,-32zM80,464c-17.6,0 -32,-14.4 -32,-32s14.4,-32 32,-32 32,14.4 32,32 -14.4,32 -32,32zM304,176c-17.6,0 -32,-14.4 -32,-32s14.4,-32 32,-32 32,14.4 32,32 -14.4,32 -32,32z"/>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="384"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M373.679,338.344l-35.16,-44.832c20.236,-16.151 24.079,-45.619 8.359,-66.438l-34.932,-46.261c21.067,-17.62 23.055,-49.355 4.372,-69.475l-89.143,-96.006c-18.969,-20.428 -51.352,-20.457 -70.348,0l-89.143,96.006c-18.704,20.143 -16.67,51.876 4.372,69.475l-34.932,46.261c-15.73,20.831 -11.864,50.298 8.359,66.438l-35.167,44.832C-14.37,369.762 8.032,416 48.058,416H160c0,36.341 -3.919,56.605 -29.657,82.343C125.318,503.368 128.88,512 136,512h112c7.106,0 10.692,-8.622 5.657,-13.657C227.943,472.629 224,452.386 224,416h111.935c39.956,0 62.472,-46.182 37.744,-77.656zM224,368v-24c0,-8.837 -7.163,-16 -16,-16h-32c-8.837,0 -16,7.163 -16,16v24H48l88,-112H75.429L160,144h-57.143L192,48l89.143,96H224l84.571,112H248l88,112H224z"/>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="384"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M192,160c44.2,0 80,-35.8 80,-80S236.2,0 192,0s-80,35.8 -80,80 35.8,80 80,80zM327.6,216.2l42.8,-30c14.5,-10.1 18,-30.1 7.8,-44.6 -10.1,-14.5 -30.1,-18 -44.6,-7.8l-42.8,30c-58.9,41.3 -138.9,41.3 -197.8,0l-42.8,-30c-14.5,-10.2 -34.5,-6.6 -44.6,7.8 -10.2,14.5 -6.7,34.4 7.8,44.6l42.8,30c17.4,12.2 36.2,21.4 55.6,28.5v40.2c-9.4,5.6 -16,15.4 -16,27.1v18.7c0,6.2 2.3,11.9 5.6,17L63,396c-9.1,11.4 -9.3,27.5 -0.6,39.2l48,64c6.3,8.4 15.9,12.8 25.6,12.8 6.7,0 13.4,-2.1 19.2,-6.4 14.2,-10.6 17,-30.7 6.4,-44.8l-33.1,-44.2 18.3,-22.9c11.3,9 25.2,14.2 39.8,14.2h11c14.6,0 28.5,-5.2 39.8,-14.2l18.3,22.9 -33.1,44.2c-10.6,14.1 -7.8,34.2 6.4,44.8 5.8,4.3 12.5,6.4 19.2,6.4 9.8,0 19.3,-4.4 25.6,-12.8l48,-64c8.8,-11.7 8.5,-27.8 -0.6,-39.2l-38.6,-48.3c3.3,-5.1 5.6,-10.8 5.6,-17L288.2,312c0,-11.7 -6.6,-21.5 -16,-27.1v-40.2c19.3,-7.1 38,-16.3 55.4,-28.5zM256,330.7l-35.9,35.9c-6,6 -14.1,9.4 -22.6,9.4h-11c-8.5,0 -16.6,-3.3 -22.6,-9.4L128,330.7L128,312h128v18.7z"/>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="448"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M128,152v-32c0,-4.4 3.6,-8 8,-8h208c4.4,0 8,3.6 8,8v32c0,4.4 -3.6,8 -8,8L136,160c-4.4,0 -8,-3.6 -8,-8zM136,240h208c4.4,0 8,-3.6 8,-8v-32c0,-4.4 -3.6,-8 -8,-8L136,192c-4.4,0 -8,3.6 -8,8v32c0,4.4 3.6,8 8,8zM435.1,399.7c-4.2,13 -4.2,51.6 0,64.6 7.3,1.4 12.9,7.9 12.9,15.7v16c0,8.8 -7.2,16 -16,16L80,512c-44.2,0 -80,-35.8 -80,-80L0,80C0,35.8 35.8,0 80,0h352c8.8,0 16,7.2 16,16v368c0,7.8 -5.5,14.2 -12.9,15.7zM394,400L80,400c-17.6,0 -32,14.4 -32,32 0,17.7 14.3,32 32,32h314c-2.7,-17.3 -2.7,-46.7 0,-64zM400,48L80,48c-17.7,0 -32,14.3 -32,32v278.7c9.8,-4.3 20.6,-6.7 32,-6.7h320L400,48z"/>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="448"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M280,328c0,-22.091 17.909,-40 40,-40s40,17.909 40,40 -17.909,40 -40,40 -40,-17.909 -40,-40zM128,368c22.091,0 40,-17.909 40,-40s-17.909,-40 -40,-40 -40,17.909 -40,40 17.909,40 40,40zM448,109.714v228.572c0,49.194 -43.706,90.629 -99.059,104.713l58.758,58.758c3.78,3.78 1.103,10.243 -4.243,10.243h-48.427a11.996,11.996 0,0 1,-8.485 -3.515L286.059,448L161.941,448l-60.485,60.485A12.002,12.002 0,0 1,92.971 512L44.544,512c-5.345,0 -8.022,-6.463 -4.243,-10.243l58.758,-58.758C43.886,428.961 0,387.656 0,338.286L0,109.714C0,45.928 71.001,0 138.286,0h171.428C377.889,0 448,45.922 448,109.714zM50.774,96h346.534c-10.2,-26.136 -47.971,-48 -87.595,-48L138.286,48c-38.862,0 -77.011,21.67 -87.512,48zM48,224h152v-80L48,144v80zM400,272L48,272v66.286C48,374.495 99.975,400 138.286,400h171.428C347.479,400 400,374.816 400,338.286L400,272zM400,144L248,144v80h152v-80z"/>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="512"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M256,8C119.043,8 8,119.083 8,256c0,136.997 111.043,248 248,248s248,-111.003 248,-248C504,119.083 392.957,8 256,8zM256,456c-110.532,0 -200,-89.431 -200,-200 0,-110.495 89.472,-200 200,-200 110.491,0 200,89.471 200,200 0,110.53 -89.431,200 -200,200zM256,118c23.196,0 42,18.804 42,42s-18.804,42 -42,42 -42,-18.804 -42,-42 18.804,-42 42,-42zM312,372c0,6.627 -5.373,12 -12,12h-88c-6.627,0 -12,-5.373 -12,-12v-24c0,-6.627 5.373,-12 12,-12h12v-64h-12c-6.627,0 -12,-5.373 -12,-12v-24c0,-6.627 5.373,-12 12,-12h64c6.627,0 12,5.373 12,12v100h12c6.627,0 12,5.373 12,12v24z"/>
</vector>
......@@ -21,6 +21,6 @@
android:viewportWidth="512"
android:viewportHeight="512">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorTextSecondary"
android:pathData="M256,8C119.043,8 8,119.083 8,256c0,136.997 111.043,248 248,248s248,-111.003 248,-248C504,119.083 392.957,8 256,8zM256,456c-110.532,0 -200,-89.431 -200,-200 0,-110.495 89.472,-200 200,-200 110.491,0 200,89.471 200,200 0,110.53 -89.431,200 -200,200zM298,352c0,23.159 -18.841,42 -42,42s-42,-18.841 -42,-42 18.841,-42 42,-42 42,18.841 42,42zM216.63,140.599l6.8,136c0.319,6.387 5.591,11.401 11.985,11.401h41.17c6.394,0 11.666,-5.014 11.985,-11.401l6.8,-136c0.343,-6.854 -5.122,-12.599 -11.985,-12.599h-54.77c-6.863,0 -12.328,5.745 -11.985,12.599z"/>
</vector>
......@@ -22,8 +22,6 @@
android:viewportHeight="24">
<path
android:pathData="m4.2686,1.0758c-0.6036,-0.0042 -1.0347,0.4743 -1.0347,1.0345L3.2338,21.8897c0,0.6036 0.4315,1.0345 1.0347,1.0345l15.5163,0c0.5604,0 0.9305,-0.4313 0.9326,-1.0345l0.0485,-14.0366l-5.8633,0c-0.6035,0 -1.0346,-0.4313 -1.0346,-1.0344l0,0 0,-5.6721zM15.2475,1.1468l0,5.3272l5.5187,0l-0.0006,-0.2587c0,-0.2585 -0.1294,-0.5173 -0.3017,-0.7328l-4.2253,-4.034c-0.2155,-0.1722 -0.4739,-0.3017 -0.7326,-0.3017zM14.0123,8.3728c0.0746,-0.002 0.1446,0.0634 0.0904,0.1535l-0.4993,0.9198c0.9725,0.5255 1.6559,1.4978 1.6559,2.6278l-6.5449,0c0,-1.13 0.6571,-2.1021 1.6559,-2.6278l-0.4993,-0.9198c-0.0526,-0.1303 0.1312,-0.2097 0.1842,-0.1048l0.4993,0.9458c0.9199,-0.4207 1.9714,-0.394 2.865,0l0.4994,-0.9458c0.0246,-0.0328 0.0595,-0.0477 0.0934,-0.0486zM10.5017,10.3394c-0.1578,0 -0.2628,0.132 -0.2628,0.2628 0,0.158 0.1051,0.2891 0.2628,0.2891 0.158,0 0.2629,-0.1312 0.2629,-0.2891 0,-0.1318 -0.1052,-0.2628 -0.2629,-0.2628zM13.4719,10.3394c-0.1311,0 -0.2628,0.132 -0.2628,0.2628 0,0.158 0.1316,0.2891 0.2628,0.2891 0.158,0 0.2892,-0.1312 0.2892,-0.2891 0,-0.1318 -0.1315,-0.2628 -0.2892,-0.2628zM7.742,12.1789c0.3942,0 0.7097,0.3418 0.7097,0.7358l0,3.048c0,0.3944 -0.3155,0.7096 -0.7097,0.7096 -0.4205,0 -0.7885,-0.3156 -0.7885,-0.7096l0,-3.048c0,-0.394 0.3679,-0.7358 0.7885,-0.7358zM16.2318,12.1789c0.4206,0 0.8149,0.3418 0.8149,0.7358l0,3.048c0,0.3944 -0.3943,0.7096 -0.8149,0.7096 -0.3943,0 -0.7097,-0.3156 -0.7097,-0.7096l0,-3.048c0,-0.394 0.3154,-0.7358 0.7097,-0.7358zM8.7405,12.3365l6.4923,0l0,4.7037c0,0.4205 -0.3417,0.7884 -0.7622,0.7884l-0.5258,0l0,1.6029c0,0.946 -1.4718,0.946 -1.4718,0l0,-1.6029l-0.9726,0l0,1.6029c0,0.946 -1.4456,0.9722 -1.4456,0l-0.026,-1.6029l-0.4993,0c-0.4469,0 -0.7886,-0.3677 -0.7886,-0.7884z"
android:strokeWidth="11.8077"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:fillColor="@color/colorTextSecondary"
android:fillType="nonZero"/>
</vector>
......@@ -28,7 +28,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/colorPrimary"
android:background="@color/colorNavigationBarBackground"
android:elevation="@dimen/default_elevation"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
app:layout_constraintTop_toTopOf="parent"
......@@ -94,7 +94,7 @@
android:enabled="false"
android:foreground="?android:selectableItemBackground"
android:text="@string/submit_button_text"
android:textColor="?android:textColorPrimaryInverse"
android:textColor="@android:color/white"
app:layout_constraintTop_toBottomOf="@id/package_name_edit_text" />
<View
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment