Create two themes

The finnmglasTheme and the darkTheme
This commit is contained in:
Finn M Glas 2020-05-22 17:25:32 +02:00
parent f6c20098b5
commit 16c180a725
No known key found for this signature in database
GPG key ID: 25037A2E81AB459C
9 changed files with 28 additions and 41 deletions

View file

@ -11,7 +11,7 @@
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/finnmglasTheme">
<activity android:name=".MainActivity" <activity android:name=".MainActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"

View file

@ -5,14 +5,12 @@
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark"
tools:context=".ChooseActivity"> tools:context=".ChooseActivity">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar" android:id="@+id/app_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorPrimaryDark"
android:gravity="center" android:gravity="center"
android:theme="@style/AppTheme.AppBarOverlay" android:theme="@style/AppTheme.AppBarOverlay"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -49,7 +47,7 @@
android:paddingLeft="16sp" android:paddingLeft="16sp"
android:paddingRight="16sp" android:paddingRight="16sp"
android:text="@string/fa_close_window" android:text="@string/fa_close_window"
android:textColor="#ffffff" android:textColor="?attr/colorAccent"
android:textSize="22sp" android:textSize="22sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

View file

@ -4,7 +4,6 @@
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark"
android:longClickable="false" android:longClickable="false"
android:onClick="clickAnywhere" android:onClick="clickAnywhere"
tools:context=".FirstStartupActivity"> tools:context=".FirstStartupActivity">

View file

@ -5,7 +5,6 @@
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark"
android:longClickable="false" android:longClickable="false"
tools:context=".MainActivity"> tools:context=".MainActivity">
@ -15,7 +14,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:onClick="dateViewOnTouch" android:onClick="dateViewOnTouch"
android:textColor="#ccc"
android:textSize="30sp" android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -29,7 +27,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:onClick="timeViewOnTouch" android:onClick="timeViewOnTouch"
android:textColor="#ccc"
android:textSize="18sp" android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -43,7 +40,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="settingsIconOnTouch" android:onClick="settingsIconOnTouch"
android:text="@string/fas_settings" android:text="@string/fas_settings"
android:textColor="#999" android:textColor="?attr/colorAccent"
android:textSize="36sp" android:textSize="36sp"
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

View file

@ -11,7 +11,6 @@
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorPrimaryDark"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/AppTheme.AppBarOverlay">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@ -43,7 +42,7 @@
android:paddingLeft="16sp" android:paddingLeft="16sp"
android:paddingRight="16sp" android:paddingRight="16sp"
android:text="@string/fa_close_window" android:text="@string/fa_close_window"
android:textColor="#ffffff" android:textColor="?attr/colorAccent"
android:textSize="22sp" android:textSize="22sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -54,8 +53,7 @@
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/tabs" android:id="@+id/tabs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:background="?attr/colorPrimaryDark" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

View file

@ -5,7 +5,6 @@
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark"
android:gravity="center|top" android:gravity="center|top"
android:orientation="vertical" android:orientation="vertical"
android:padding="32sp" android:padding="32sp"
@ -33,7 +32,6 @@
android:paddingLeft="10sp" android:paddingLeft="10sp"
android:paddingRight="10sp" android:paddingRight="10sp"
android:text="@string/settings_choose_up" android:text="@string/settings_choose_up"
android:textColor="#ccc"
android:textSize="20sp" /> android:textSize="20sp" />
<Button <Button
@ -57,7 +55,6 @@
android:paddingLeft="10sp" android:paddingLeft="10sp"
android:paddingRight="10sp" android:paddingRight="10sp"
android:text="@string/settings_choose_down" android:text="@string/settings_choose_down"
android:textColor="#ccc"
android:textSize="20sp" /> android:textSize="20sp" />
<Button <Button
@ -82,7 +79,6 @@
android:paddingLeft="10sp" android:paddingLeft="10sp"
android:paddingRight="10sp" android:paddingRight="10sp"
android:text="@string/settings_choose_left" android:text="@string/settings_choose_left"
android:textColor="#ccc"
android:textSize="20sp" /> android:textSize="20sp" />
<Button <Button
@ -106,7 +102,6 @@
android:paddingLeft="10sp" android:paddingLeft="10sp"
android:paddingRight="10sp" android:paddingRight="10sp"
android:text="@string/settings_choose_right" android:text="@string/settings_choose_right"
android:textColor="#ccc"
android:textSize="20sp" /> android:textSize="20sp" />
<Button <Button
@ -131,7 +126,6 @@
android:paddingLeft="10sp" android:paddingLeft="10sp"
android:paddingRight="10sp" android:paddingRight="10sp"
android:text="@string/settings_choose_vol_up" android:text="@string/settings_choose_vol_up"
android:textColor="#ccc"
android:textSize="20sp" /> android:textSize="20sp" />
<Button <Button
@ -155,7 +149,6 @@
android:paddingLeft="10sp" android:paddingLeft="10sp"
android:paddingRight="10sp" android:paddingRight="10sp"
android:text="@string/settings_choose_vol_down" android:text="@string/settings_choose_vol_down"
android:textColor="#ccc"
android:textSize="20sp" /> android:textSize="20sp" />
<Button <Button
@ -171,7 +164,6 @@
</TableLayout> </TableLayout>
<Button <Button
style="@style/Widget.AppCompat.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="chooseLaunchApp" android:onClick="chooseLaunchApp"
@ -179,7 +171,6 @@
android:textAllCaps="false" /> android:textAllCaps="false" />
<Button <Button
style="@style/Widget.AppCompat.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="chooseInstallApp" android:onClick="chooseInstallApp"
@ -187,7 +178,6 @@
android:textAllCaps="false" /> android:textAllCaps="false" />
<Button <Button
style="@style/Widget.AppCompat.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="chooseUninstallApp" android:onClick="chooseUninstallApp"

View file

@ -5,14 +5,12 @@
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark"
android:gravity="center|top" android:gravity="center|top"
android:orientation="vertical" android:orientation="vertical"
android:padding="32sp" android:padding="32sp"
tools:context=".SettingsActivity"> tools:context=".SettingsActivity">
<Button <Button
style="@style/Widget.AppCompat.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="setLauncher" android:onClick="setLauncher"
@ -20,7 +18,6 @@
android:textAllCaps="false" /> android:textAllCaps="false" />
<Button <Button
style="@style/Widget.AppCompat.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="viewTutorial" android:onClick="viewTutorial"
@ -28,7 +25,6 @@
android:textAllCaps="false" /> android:textAllCaps="false" />
<Button <Button
style="@style/Widget.AppCompat.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="32sp" android:layout_marginBottom="32sp"
@ -37,7 +33,6 @@
android:textAllCaps="false" /> android:textAllCaps="false" />
<Button <Button
style="@style/Widget.AppCompat.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="rateApp" android:onClick="rateApp"
@ -54,7 +49,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_footer_by" android:text="@string/settings_footer_by"
android:textColor="#999"
android:textSize="18sp" /> android:textSize="18sp" />
<TextView <TextView
@ -70,7 +64,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text=" | " android:text=" | "
android:textColor="#999"
android:textSize="18sp" android:textSize="18sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />

View file

@ -5,7 +5,6 @@
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark"
android:gravity="center|top" android:gravity="center|top"
android:orientation="vertical" android:orientation="vertical"
android:padding="32sp" android:padding="32sp"

View file

@ -1,20 +1,33 @@
<resources> <resources>
<!-- Base application theme. --> <!-- Personal Theme of Finn M Glas -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="finnmglasTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. --> <item name="colorPrimary">#252827</item>
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">#252827</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="android:colorBackground">#252827</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="colorAccent">#5555ff</item>
<item name="android:textColor">#ffffff</item>
<item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
<item name="android:windowDisablePreview">true</item> <item name="android:windowDisablePreview">true</item>
</style> </style>
<style name="AppTheme.NoActionBar"> <!-- A dark efficiency theme -->
<item name="windowActionBar">false</item> <style name="darkTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="windowNoTitle">true</item> <item name="colorPrimary">#000</item>
<item name="colorPrimaryDark">#000</item>
<item name="android:colorBackground">#000</item>
<item name="colorAccent">#333</item>
<item name="android:textColor">#ccc</item>
<item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
<item name="android:windowDisablePreview">true</item>
</style> </style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
</resources> </resources>