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

Rename packages and move files

Browse source 
- Rename MainActivity to HomeActivity
- Move functions.kt one level up
- Rename package `extern` to `libraries`
- Fix layouts and layout elements (nomenclature: 
`activity_fragment_element`)
- Move SectionsPagerAdapter code into the related activity kotlin file
This commit is contained in:
Finn M Glas 2020-06-17 20:42:45 +02:00
parent a828b90bb2
commit 7669c44b4d
No known key found for this signature in database
GPG key ID: 902A30146014DFBF
34 changed files with 604 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

33
app/src/main/res/layout/fragment_choose_apps.xml
View file

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragment_choose_apps_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:gravity="center|top"
android:orientation="vertical"
tools:context=".choose.apps.ChooseFragmentApps">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_choose_apps_recycler_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

33
app/src/main/res/layout/fragment_choose_other.xml
View file

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragment_choose_other_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:gravity="center|top"
android:orientation="vertical"
tools:context=".choose.other.ChooseFragmentOther">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/fragment_choose_other_recycler_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

60
app/src/main/res/layout/fragment_settings_apps.xml
View file

@ -1,60 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragment_settings_apps_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:gravity="center|top"
android:orientation="vertical"
android:paddingLeft="32sp"
android:paddingTop="16sp"
android:paddingRight="32sp"
tools:context=".settings.actions.SettingsFragmentApps">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/activity_settings_actions_recycler_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toTopOf="@+id/settings_app_btn_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</androidx.recyclerview.widget.RecyclerView>
<LinearLayout
android:id="@+id/settings_app_btn_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<Button
android:id="@+id/fragment_settings_apps_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_apps"
android:textAllCaps="false" />
<Button
android:id="@+id/fragment_settings_apps_install_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_install"
android:textAllCaps="false" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

15
app/src/main/res/layout/activity_main.xml → app/src/main/res/layout/home.xml
View file

@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<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/activity_main_container"
android:id="@+id/home_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:longClickable="false"
tools:context=".MainActivity">
tools:context=".HomeActivity">
<ImageView
android:id="@+id/activity_main_background_image"
android:id="@+id/home_background_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
@ -20,7 +21,7 @@
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/activity_main_date_view"
android:id="@+id/home_date_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
@ -33,7 +34,7 @@
app:layout_constraintVertical_bias="0.45" />
<TextView
android:id="@+id/activity_main_time_view"
android:id="@+id/home_time_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
@ -45,8 +46,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/activity_main_settings_icon"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/home_settings_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="settingsIconOnTouch"

19
app/src/main/res/layout/activity_choose.xml → app/src/main/res/layout/list.xml
View file

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<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/activity_choose_container"
android:id="@+id/list_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
tools:context=".choose.ChooseActivity">
tools:context=".list.ListActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/activity_choose_app_bar"
android:id="@+id/list_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -23,7 +24,7 @@
android:layout_height="match_parent">
<TextView
android:id="@+id/activity_choose_heading"
android:id="@+id/list_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@ -36,8 +37,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/activity_choose_close"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/list_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@ -57,7 +58,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.tabs.TabLayout
android:id="@+id/activity_choose_tabs"
android:id="@+id/list_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
custom:tabTextColor="?attr/android:textColor" />
@ -65,13 +66,13 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/activity_choose_view_pager"
android:id="@+id/list_viewpager"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/activity_choose_app_bar"
app:layout_constraintTop_toBottomOf="@id/list_appbar"
custom:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.constraintlayout.widget.ConstraintLayout>

23
app/src/main/res/layout/list_apps.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/list_apps_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_apps_rview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

14
app/src/main/res/layout/recycler_apps_row.xml → app/src/main/res/layout/list_apps_row.xml
View file

@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/list_apps_row_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15sp">
<ImageView
android:id="@+id/choose_row_app_icon"
android:id="@+id/list_apps_row_icon"
android:layout_width="40sp"
android:layout_height="40sp"
app:layout_constraintBottom_toBottomOf="parent"
@ -16,7 +18,7 @@
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/choose_row_app_name"
android:id="@+id/list_apps_row_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="60sp"
@ -27,12 +29,12 @@
android:text=""
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/choose_row_app_menu"
app:layout_constraintEnd_toStartOf="@+id/list_apps_row_menu"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/choose_row_app_menu"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/list_apps_row_menu"
android:layout_width="30sp"
android:layout_height="0dp"
android:gravity="center"

23
app/src/main/res/layout/list_other.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/list_other_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_other_rview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

11
app/src/main/res/layout/recycler_other_row.xml → app/src/main/res/layout/list_other_row.xml
View file

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/list_other_row_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15sp">
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/row_other_fa_icon"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/list_other_row_icon"
android:layout_width="40sp"
android:layout_height="40sp"
android:gravity="center"
@ -18,7 +19,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/row_other_name"
android:id="@+id/list_other_row_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="60sp"

21
app/src/main/res/layout/activity_settings.xml → app/src/main/res/layout/settings.xml
View file

@ -4,13 +4,13 @@
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/activity_settings_container"
android:id="@+id/settings_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".settings.SettingsActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/activity_settings_app_bar"
android:id="@+id/settings_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -19,7 +19,7 @@
android:layout_height="match_parent">
<TextView
android:id="@+id/activity_settings_heading"
android:id="@+id/settings_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@ -33,8 +33,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/activity_settings_close"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/settings_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
@ -52,8 +52,8 @@
app:layout_constraintTop_toTopOf="parent"
custom:type="solid" />
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/activity_settings_device_settings"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/settings_system"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
@ -67,11 +67,12 @@
custom:layout_constraintBottom_toBottomOf="parent"
custom:layout_constraintStart_toStartOf="parent"
custom:layout_constraintTop_toTopOf="parent"
custom:type="solid" />
custom:type="solid"
android:layout_marginStart="8dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.tabs.TabLayout
android:id="@+id/activity_settings_tabs"
android:id="@+id/settings_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabTextColor="?attr/android:textColor" />
@ -79,7 +80,7 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/activity_settings_view_pager"
android:id="@+id/settings_viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

49
app/src/main/res/layout/settings_actions.xml Normal file
View file

@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/settings_actions_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="32sp"
android:paddingTop="16sp"
android:paddingRight="32sp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/settings_actions_rview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toTopOf="@+id/settings_actions_buttons"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</androidx.recyclerview.widget.RecyclerView>
<LinearLayout
android:id="@+id/settings_actions_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<Button
android:id="@+id/settings_actions_button_view_apps"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_apps"
android:textAllCaps="false" />
<Button
android:id="@+id/settings_actions_button_install_apps"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_install"
android:textAllCaps="false" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

30
app/src/main/res/layout/recycler_actions_row.xml → app/src/main/res/layout/settings_actions_row.xml
View file

@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/settings_actions_row_container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/row_action_name"
android:id="@+id/settings_actions_row_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
@ -15,12 +17,12 @@
android:text=""
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/row_choose_button"
app:layout_constraintEnd_toStartOf="@id/settings_actions_row_button_choose"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/row_choose_button"
android:id="@+id/settings_actions_row_button_choose"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_choose_btn"
@ -30,38 +32,38 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/row_app_fa_icon"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/settings_actions_row_icon"
android:layout_width="@dimen/app_icon_side"
android:layout_height="@dimen/app_icon_side"
android:gravity="center"
android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/row_choose_button"
app:layout_constraintEnd_toEndOf="@id/settings_actions_row_button_choose"
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toStartOf="@+id/row_choose_button"
app:layout_constraintStart_toStartOf="@+id/settings_actions_row_button_choose"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/row_app_icon"
android:id="@+id/settings_actions_row_icon_img"
android:layout_width="@dimen/app_icon_side"
android:layout_height="@dimen/app_icon_side"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/row_choose_button"
app:layout_constraintEnd_toEndOf="@id/settings_actions_row_button_choose"
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toStartOf="@+id/row_choose_button"
app:layout_constraintStart_toStartOf="@+id/settings_actions_row_button_choose"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/row_remove_action"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/settings_actions_row_remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8sp"
android:text="@string/fas_times"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/row_app_icon"
app:layout_constraintStart_toEndOf="@+id/settings_actions_row_icon_img"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

29
app/src/main/res/layout/fragment_settings_meta.xml → app/src/main/res/layout/settings_meta.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragment_settings_meta_container"
android:id="@+id/settings_meta_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
@ -15,21 +15,21 @@
tools:context=".settings.meta.SettingsFragmentMeta">
<Button
android:id="@+id/fragment_settings_meta_select_launcher_btn"
android:id="@+id/settings_meta_button_select_launcher"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_select_launcher"
android:textAllCaps="false" />
<Button
android:id="@+id/fragment_settings_meta_view_tutorial_btn"
android:id="@+id/settings_meta_button_view_tutorial"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_show_tutorial"
android:textAllCaps="false" />
<Button
android:id="@+id/fragment_settings_meta_reset_settings_btn"
android:id="@+id/settings_meta_button_reset_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32sp"
@ -37,6 +37,7 @@
android:textAllCaps="false" />
<LinearLayout
android:id="@+id/settings_meta_layout_icons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32sp"
@ -44,8 +45,8 @@
android:gravity="center"
android:orientation="horizontal">
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/fragment_settings_meta_footer_play_icon"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/settings_meta_icon_google_play"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@ -60,8 +61,8 @@
android:textSize="40sp"
custom:type="brands" />
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/fragment_settings_meta_footer_github_icon"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/settings_meta_icon_github"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@ -76,8 +77,8 @@
android:textSize="40sp"
custom:type="brands" />
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/fragment_settings_meta_footer_globe_icon"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/settings_meta_icon_globe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@ -95,7 +96,7 @@
</LinearLayout>
<Button
android:id="@+id/fragment_settings_meta_contact_btn"
android:id="@+id/settings_meta_button_contact"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32sp"
@ -103,7 +104,7 @@
android:textAllCaps="false" />
<Button
android:id="@+id/fragment_settings_meta_donate_btn"
android:id="@+id/settings_meta_button_donate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_meta_donate"

23
app/src/main/res/layout/fragment_settings_theme.xml → app/src/main/res/layout/settings_theme.xml
View file

@ -2,9 +2,8 @@
<LinearLayout
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/fragment_settings_theme_container"
android:id="@+id/settings_theme_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
@ -16,6 +15,7 @@
tools:context=".settings.meta.SettingsFragmentMeta">
<ScrollView
android:id="@+id/settings_theme_scroller"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -25,6 +25,7 @@
android:orientation="vertical">
<androidx.cardview.widget.CardView
android:id="@+id/settings_theme_finn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10sp"
@ -35,6 +36,7 @@
android:layout_height="match_parent">
<ImageView
android:id="@+id/settings_theme_finn_img"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
@ -43,7 +45,7 @@
tools:ignore="ContentDescription" />
<Button
android:id="@+id/fragment_settings_theme_select_finn_btn"
android:id="@+id/settings_theme_finn_button_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_select_theme"
@ -56,6 +58,7 @@
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/settings_theme_dark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10sp"
@ -66,6 +69,7 @@
android:layout_height="match_parent">
<ImageView
android:id="@+id/settings_theme_dark_img"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
@ -74,7 +78,7 @@
tools:ignore="ContentDescription" />
<Button
android:id="@+id/fragment_settings_theme_select_dark_btn"
android:id="@+id/settings_theme_dark_button_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_select_theme"
@ -86,6 +90,7 @@
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/settings_theme_custom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10sp"
@ -96,7 +101,7 @@
android:layout_height="match_parent">
<ImageView
android:id="@+id/imageView"
android:id="@+id/settings_theme_custom_img"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
@ -105,7 +110,7 @@
tools:ignore="ContentDescription" />
<Button
android:id="@+id/fragment_settings_theme_select_custom_btn"
android:id="@+id/settings_theme_custom_button_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_select_theme"
@ -114,15 +119,15 @@
app:layout_constraintEnd_toEndOf="parent" />
<Button
android:id="@+id/fragment_settings_theme_custom_examples_btn"
android:id="@+id/settings_theme_custom_button_examples"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_theme_examples"
android:textAllCaps="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/fragment_settings_theme_select_custom_btn" />
app:layout_constraintEnd_toStartOf="@id/settings_theme_custom_button_select" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>

21
app/src/main/res/layout/activity_tutorial.xml → app/src/main/res/layout/tutorial.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<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/activity_firststartup_container"
android:id="@+id/tutorial_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
@ -11,7 +12,7 @@
tools:context=".tutorial.TutorialActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/activity_firststartup_app_bar"
android:id="@+id/tutorial_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -25,7 +26,7 @@
android:layout_height="match_parent">
<TextView
android:id="@+id/activity_firststartup_heading"
android:id="@+id/tutorial_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@ -37,8 +38,8 @@
custom:layout_constraintStart_toStartOf="parent"
custom:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/activity_firststartup_close"
<com.finnmglas.launcher.libraries.FontAwesome
android:id="@+id/tutorial_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@ -60,7 +61,7 @@
</com.google.android.material.appbar.AppBarLayout>
<TextView
android:id="@+id/activity_firststartup_section_heading"
android:id="@+id/tutorial_page_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@ -73,7 +74,7 @@
app:layout_constraintVertical_bias="0.100000024" />
<TextView
android:id="@+id/activity_firststartup_descriptive_text"
android:id="@+id/tutorial_page_text"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="32dp"
@ -89,10 +90,10 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/activity_firststartup_section_heading" />
app:layout_constraintTop_toBottomOf="@id/tutorial_page_heading" />
<TextView
android:id="@+id/activity_firststartup_hint_text"
android:id="@+id/tutorial_page_hint"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="32dp"
@ -109,6 +110,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/activity_firststartup_descriptive_text" />
app:layout_constraintTop_toBottomOf="@id/tutorial_page_text" />
</androidx.constraintlayout.widget.ConstraintLayout>