Skip to content

Commit

Permalink
Redo setup theme
Browse files Browse the repository at this point in the history
  • Loading branch information
@Domi04151309
Domi04151309 committed Dec 30, 2023
1 parent f0fdd35 commit 87375b1
Show file tree
Hide file tree
Showing 14 changed files with 69 additions and 110 deletions.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
android:parentActivityName=".activities.AboutActivity" />
<activity
android:name=".activities.SetupActivity"
android:theme="@style/SetupTheme" />
android:theme="@style/Theme.Material3.DayNight.NoActionBar" />

<receiver
android:name=".receivers.AdminReceiver"
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/io/github/domi04151309/alwayson/activities/SetupActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,26 @@ import android.provider.Settings
import android.text.format.DateFormat
import android.widget.Button
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentTransaction
import androidx.preference.PreferenceManager
import com.google.android.material.elevation.SurfaceColors
import io.github.domi04151309.alwayson.R
import io.github.domi04151309.alwayson.activities.setup.DrawOverOtherAppsFragment
import io.github.domi04151309.alwayson.activities.setup.PhoneStateFragment
import io.github.domi04151309.alwayson.helpers.P

class SetupActivity : AppCompatActivity() {
class SetupActivity : BaseActivity() {
private var currentFragment = DRAW_OVER_OTHER_APPS_FRAGMENT
private var isActionRequired = false

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_setup)

window.statusBarColor = SurfaceColors.SURFACE_0.getColor(this)

val prefsEditor = PreferenceManager.getDefaultSharedPreferences(this).edit()
swapContentFragment(DrawOverOtherAppsFragment(), DRAW_OVER_OTHER_APPS_FRAGMENT)

Expand Down
7 changes: 0 additions & 7 deletions app/src/main/res/drawable/setup_card.xml
View file

This file was deleted.

81 changes: 28 additions & 53 deletions app/src/main/res/layout/activity_setup.xml
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
tools:context=".activities.SetupActivity">

<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/setup_header"
android:gravity="bottom"
android:padding="32dp"
android:text="@string/setup_header"
android:textColor="@android:color/white"
android:textAppearance="@style/TextAppearance.AppCompat.Display2" />
android:layout_width="match_parent"
android:layout_height="match_parent">

<RelativeLayout
<FrameLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/setup_card">

<LinearLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="32dp" />
android:layout_height="wrap_content"
android:layout_centerInParent="true" />

<Button
android:id="@+id/continueBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="?dialogPreferredPadding"
android:layout_marginTop="?dialogPreferredPadding"
android:layout_marginEnd="?dialogPreferredPadding"
android:layout_marginBottom="?dialogPreferredPadding"
android:background="@null"
android:text="@string/setup_continue"
android:textColor="?attr/colorAccent"
tools:ignore="RelativeOverlap" />
<Button
android:id="@+id/continueBtn"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_margin="?dialogPreferredPadding"
android:text="@string/setup_continue"
tools:ignore="RelativeOverlap" />

<Button
android:id="@+id/skipBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="?dialogPreferredPadding"
android:layout_marginTop="?dialogPreferredPadding"
android:layout_marginEnd="?dialogPreferredPadding"
android:layout_marginBottom="?dialogPreferredPadding"
android:background="@null"
android:text="@string/setup_skip"
android:textColor="?android:attr/textColorSecondary" />
</RelativeLayout>
</LinearLayout>
<Button
android:id="@+id/skipBtn"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
android:layout_margin="?dialogPreferredPadding"
android:text="@string/setup_skip"
android:textColor="?android:attr/textColorSecondary" />
</RelativeLayout>
33 changes: 18 additions & 15 deletions app/src/main/res/layout/fragment_setup_draw_over_other_apps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,30 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:layout_marginBottom="?actionBarSize"
android:layout_gravity="center"
android:padding="?dialogPreferredPadding">

<ImageView
android:layout_width="@dimen/setup_icon_size"
android:layout_height="@dimen/setup_icon_size"
android:layout_gravity="center"
android:layout_marginBottom="?dialogPreferredPadding"
android:contentDescription="@null"
app:srcCompat="@drawable/ic_color_draw_over_other_apps" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/setup_draw_over_other_apps"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
android:layout_marginBottom="?dialogPreferredPadding"
android:textAppearance="@style/TextAppearance.Material3.DisplayMedium"
android:breakStrategy="balanced"
android:text="@string/setup_draw_over_other_apps" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/setup_draw_over_other_apps_summary"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="?android:attr/textColorSecondary" />

<ImageView
android:layout_width="@dimen/setup_icon_size"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_margin="16dp"
android:contentDescription="@null"
app:srcCompat="@drawable/ic_color_draw_over_other_apps" />
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:text="@string/setup_draw_over_other_apps_summary" />
</LinearLayout>
33 changes: 18 additions & 15 deletions app/src/main/res/layout/fragment_setup_phone_state.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,30 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content"
android:layout_marginBottom="?actionBarSize"
android:layout_gravity="center"
android:padding="?dialogPreferredPadding">

<ImageView
android:layout_width="@dimen/setup_icon_size"
android:layout_height="@dimen/setup_icon_size"
android:layout_gravity="center"
android:layout_marginBottom="?dialogPreferredPadding"
android:contentDescription="@null"
app:srcCompat="@drawable/ic_color_phone_state" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/setup_phone_state"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
android:layout_marginBottom="?dialogPreferredPadding"
android:textAppearance="@style/TextAppearance.Material3.DisplayMedium"
android:breakStrategy="balanced"
android:text="@string/setup_phone_state" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/setup_phone_state_summary"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="?android:attr/textColorSecondary" />

<ImageView
android:layout_width="@dimen/setup_icon_size"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_margin="16dp"
android:contentDescription="@null"
app:srcCompat="@drawable/ic_color_phone_state" />
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:text="@string/setup_phone_state_summary" />
</LinearLayout>
1 change: 0 additions & 1 deletion app/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<string name="service_text">AlwaysOn läuft im Hintergrund</string>
<string name="service_channel">Servicekanal</string>

<string name="setup_header">Setup</string>
<string name="setup_root_failed">Root-Anfrage fehlgeschlagen! Bitte versuchen Sie es erneut oder wechseln Sie den Modus!</string>
<string name="device_admin">Geräteadministrator</string>
<string name="device_admin_summary">Sie müssen diesen Geräteadministrator aktivieren oder in den Root-Modus wechseln, damit diese App funktioniert.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-es/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<string name="service_text">AlwaysOn está corriendo en el fondo</string>
<string name="service_channel">Canal de servicio</string>

<string name="setup_header">Configuración</string>
<string name="setup_root_failed">¡Solicitud de root fallida! ¡Por favor, inténtelo de nuevo o cambie de modo!</string>
<string name="device_admin">Administración del dispositivo</string>
<string name="device_admin_summary">Necesitas activar el administrador del dispositivo o cambiar al modo root para que esta aplicación funcione.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-fr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<string name="service_text">AlwaysOn est lancé en arrière plan</string>
<string name="service_channel">Chaîne de service</string>

<string name="setup_header">Paramétrage</string>
<string name="setup_root_failed">La requête root a échoué! Merci de réessayer ou de changer de mode!</string>
<string name="device_admin">Administrateur de l\’appareil</string>
<string name="device_admin_summary">Vous devez être root (devenir administrateur) ou changer de mode pour que cette application fonctionne.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-nl/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<string name="service_text">AlwaysOn draait op de achtergrond</string>
<string name="service_channel">Dienstkanaal</string>

<string name="setup_header">Instelhulp</string>
<string name="setup_root_failed">Rootverzoek mislukt! Probeer het opnieuw of kies een andere modus.</string>
<string name="device_admin">Apparaatbeheerder</string>
<string name="device_admin_summary">Schakel deze apparaatbeheerder in of kies voor de rootmodus.</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-ru/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<string name="service_text">AlwaysOn работает в фоновом режиме</string>
<string name="service_channel">Сервисный канал</string>

<string name="setup_header">Настройка</string>
<string name="setup_root_failed">Запрос на root права не выполнен! Пожалуйста, попробуйте еще раз или переключите режим!</string>
<string name="device_admin">Администратор Устройства</string>
<string name="device_admin_summary">Вам нужно активировать права администратора или переключиться в root, чтобы это приложение работало.</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="setup_header">192dp</dimen>
<dimen name="setup_corner">16dp</dimen>
<dimen name="setup_icon_size">192dp</dimen>

<dimen name="widget_margin">0dp</dimen>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<string name="service_text">AlwaysOn is running in the background</string>
<string name="service_channel">Service channel</string>

<string name="setup_header">Setup</string>
<string name="setup_root_failed">Root request failed! Please try again or switch mode!</string>
<string name="device_admin">Device Admin</string>
<string name="device_admin_summary">You need to activate this device admin or switch to root mode for this app to work.</string>
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,6 @@
<item name="android:windowLightStatusBar">true</item>
</style>

<style name="SetupTheme" parent="Theme.AppCompat.Light">
<item name="colorPrimary">@color/colorAccent</item>
<item name="colorPrimaryDark">@color/colorAccent</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowBackground">@color/colorAccent</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="AppThemeSplash" parent="AppThemeScreenOff">
<item name="android:windowBackground">@drawable/splash</item>
<item name="android:textColorSecondary">@android:color/white</item>
Expand Down

0 comments on commit 87375b1

Please sign in to comment.