jrpie/launcher
1
0
Fork 0
mirror of https://github.com/jrpie/Launcher.git synced 2025-04-19 02:10:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix older API alerts, Add titlebar to tutorial (on replay)

Browse source
This commit is contained in:
Finn M Glas 2020-05-22 22:48:05 +02:00
parent c81e6c06bc
commit dc1238e4e0
No known key found for this signature in database
GPG key ID: 25037A2E81AB459C
10 changed files with 71 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/layout/activity_choose.xml
View file

@ -13,7 +13,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:theme="@style/AppTheme.AppBarOverlay"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

49
app/src/main/res/layout/activity_firststartup.xml
View file

@ -1,5 +1,6 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:custom="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
@ -9,6 +10,54 @@
android:onClick="clickAnywhere"
tools:context=".FirstStartupActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:visibility="invisible"
custom:layout_constraintEnd_toEndOf="parent"
custom:layout_constraintStart_toStartOf="parent"
custom:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:minHeight="?actionBarSize"
android:padding="@dimen/appbar_padding"
android:text="@string/tutorial_title"
android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
custom:layout_constraintEnd_toEndOf="parent"
custom:layout_constraintStart_toStartOf="parent"
custom:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.FontAwesome
android:id="@+id/close_tutorial"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:gravity="center"
android:includeFontPadding="true"
android:onClick="backToSettings"
android:paddingLeft="16sp"
android:paddingRight="16sp"
android:text="@string/fa_close_window"
android:textColor="?attr/colorAccent"
android:textSize="22sp"
custom:layout_constraintBottom_toBottomOf="parent"
custom:layout_constraintEnd_toEndOf="parent"
custom:layout_constraintTop_toTopOf="parent"
custom:type="solid" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.appbar.AppBarLayout>
<TextView
android:id="@+id/heading"
android:layout_width="wrap_content"

6
app/src/main/res/layout/activity_settings.xml
View file

@ -10,8 +10,7 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -53,7 +52,8 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
app:tabTextColor="?attr/android:textColor" />
</com.google.android.material.appbar.AppBarLayout>

1
app/src/main/res/values-de/strings.xml
View file

@ -50,6 +50,7 @@
<string name="choose_not_removed_toast">Die App konnte nicht entfernt werden</string>
<!-- FirstStartup Activity -->
<string name="tutorial_title">Tutorial</string>
<string-array name="intro">
<!--item> heading | infoText | hintText | size | format </item-->
<item>|Nimm dir kurz Zeit und lerne, wie du diesen Launcher verwendest!\n\n|— Tippe um weiterzukommen —|36F|0</item>

1
app/src/main/res/values-fr/strings.xml
View file

@ -50,6 +50,7 @@
<string name="choose_not_removed_toast">Impossible de supprimer l\'application</string>
<!-- FirstStartup Activity -->
<string name="tutorial_title">Le Tutoriel</string>
<string-array name="intro">
<!--item> heading | infoText | hintText | size | format </item-->
<item>|Prenez un moment et apprenez à utiliser ce lanceur!\n\n|— Appuyez pour continuer —|36F|0</item>

1
app/src/main/res/values/strings.xml
View file

@ -58,6 +58,7 @@
<string name="choose_not_removed_toast">Unable to remove application</string>
<!-- FirstStartup Activity -->
<string name="tutorial_title">Tutorial</string>
<string-array name="intro">
<!--item> heading | infoText | hintText | size | format </item-->
<item>|Take a few seconds to learn how to use this Launcher!\n\n|— Tap anywhere to continue —|36F|0</item>

5
app/src/main/res/values/styles.xml
View file

@ -19,7 +19,6 @@
<style name="darkTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/darkTheme_background_color</item>
<item name="colorPrimaryDark">@color/darkTheme_background_color</item>
<item name="android:colorBackground">@color/darkTheme_background_color</item>
<item name="colorAccent">@color/darkTheme_accent_color</item>
@ -30,6 +29,8 @@
<item name="android:windowDisablePreview">true</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AlertDialogCustom" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:textColor">#000000</item>
</style>
</resources>