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

Clean and Refractor code.

Browse source 
Split up the `SettingsActivity` into the smaller Fragments, Rename many 
ids... overall cleaner code.

It is 03:56 am and I did not sleep yet... I won't today ^^
This commit is contained in:
Finn M Glas 2020-05-24 03:59:25 +02:00
parent ff72364983
commit 0eecdff99f
No known key found for this signature in database
GPG key ID: 25037A2E81AB459C
21 changed files with 530 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,15 +1,16 @@
<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:custom="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:id="@+id/activity_choose_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
tools:context=".ChooseActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:id="@+id/activity_choose_app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -22,7 +23,7 @@
android:layout_height="match_parent">
<TextView
android:id="@+id/heading"
android:id="@+id/activity_choose_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@ -35,8 +36,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.FontAwesome
android:id="@+id/close_chooser"
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/activity_choose_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@ -69,10 +70,10 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/app_bar">
app:layout_constraintTop_toBottomOf="@id/activity_choose_app_bar">
<LinearLayout
android:id="@+id/apps_list"
android:id="@+id/activity_choose_apps_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />

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

@ -1,17 +1,17 @@
<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:custom="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:id="@+id/activity_firststartup_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:longClickable="false"
android:onClick="clickAnywhere"
tools:context=".FirstStartupActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
android:id="@+id/activity_firststartup_app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -25,6 +25,7 @@
android:layout_height="match_parent">
<TextView
android:id="@+id/activity_firststartup_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@ -36,8 +37,8 @@
custom:layout_constraintStart_toStartOf="parent"
custom:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.FontAwesome
android:id="@+id/close_tutorial"
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/activity_firststartup_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@ -59,7 +60,7 @@
</com.google.android.material.appbar.AppBarLayout>
<TextView
android:id="@+id/heading"
android:id="@+id/activity_firststartup_section_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/infoText"
android:id="@+id/activity_firststartup_descriptive_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/heading" />
app:layout_constraintTop_toBottomOf="@id/activity_firststartup_section_heading" />
<TextView
android:id="@+id/hintText"
android:id="@+id/activity_firststartup_hint_text"
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/infoText" />
app:layout_constraintTop_toBottomOf="@id/activity_firststartup_descriptive_text" />
</androidx.constraintlayout.widget.ConstraintLayout>

22
app/src/main/res/layout/activity_main.xml
View file

@ -1,8 +1,9 @@
<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:custom="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:id="@+id/activity_main_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
@ -10,18 +11,19 @@
tools:context=".MainActivity">
<ImageView
android:id="@+id/background_image"
android:id="@+id/activity_main_background_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:orientation="vertical"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/dateView"
android:id="@+id/activity_main_date_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:gravity="start|center_vertical"
android:onClick="dateViewOnTouch"
android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="parent"
@ -31,10 +33,10 @@
app:layout_constraintVertical_bias="0.45" />
<TextView
android:id="@+id/timeView"
android:id="@+id/activity_main_time_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left|center_vertical"
android:gravity="start|center_vertical"
android:onClick="timeViewOnTouch"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
@ -43,8 +45,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.FontAwesome
android:id="@+id/settingstooltip"
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/activity_main_settings_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="settingsIconOnTouch"

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

@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout
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:id="@+id/activity_settings_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingsActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/activity_settings_app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -17,7 +19,7 @@
android:layout_height="match_parent">
<TextView
android:id="@+id/heading"
android:id="@+id/activity_settings_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@ -26,11 +28,13 @@
android:text="@string/settings_title"
android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.finnmglas.launcher.FontAwesome
android:id="@+id/close_settings"
<com.finnmglas.launcher.extern.FontAwesome
android:id="@+id/activity_settings_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@ -50,7 +54,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
android:id="@+id/activity_settings_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabTextColor="?attr/android:textColor" />
@ -58,7 +62,7 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:id="@+id/activity_settings_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

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

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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/container"
android:id="@+id/fragment_settings_apps_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
@ -11,10 +12,9 @@
android:paddingTop="16sp"
android:paddingLeft="32sp"
android:paddingRight="32sp"
tools:context=".SettingsActivity">
tools:context=".settings.SettingsFragmentApps">
<TableLayout
android:id="@+id/actionschooser"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="32sp"
@ -29,7 +29,7 @@
android:gravity="center">
<TextView
android:id="@+id/text_up"
android:id="@+id/fragment_settings_apps_text_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10sp"
@ -38,10 +38,9 @@
android:textSize="20sp" />
<Button
android:id="@+id/btn_choose_up"
android:id="@+id/fragment_settings_apps_choose_up_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="chooseUpApp"
android:text="@string/settings_choose_btn"
android:textAllCaps="false" />
</TableRow>
@ -52,7 +51,7 @@
android:gravity="center">
<TextView
android:id="@+id/text_down"
android:id="@+id/fragment_settings_apps_choose_down_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10sp"
@ -61,10 +60,9 @@
android:textSize="20sp" />
<Button
android:id="@+id/btn_choose_down"
android:id="@+id/fragment_settings_apps_choose_down_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseDownApp"
android:text="@string/settings_choose_btn"
android:textAllCaps="false" />
@ -76,7 +74,7 @@
android:gravity="center">
<TextView
android:id="@+id/text_left"
android:id="@+id/fragment_settings_apps_choose_left_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10sp"
@ -85,10 +83,9 @@
android:textSize="20sp" />
<Button
android:id="@+id/btn_choose_left"
android:id="@+id/fragment_settings_apps_choose_left_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseLeftApp"
android:text="@string/settings_choose_btn"
android:textAllCaps="false" />
</TableRow>
@ -99,7 +96,7 @@
android:gravity="center">
<TextView
android:id="@+id/text_right"
android:id="@+id/fragment_settings_apps_choose_right_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10sp"
@ -108,10 +105,9 @@
android:textSize="20sp" />
<Button
android:id="@+id/btn_choose_right"
android:id="@+id/fragment_settings_apps_choose_right_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="chooseRightApp"
android:text="@string/settings_choose_btn"
android:textAllCaps="false" />
@ -123,7 +119,7 @@
android:gravity="center">
<TextView
android:id="@+id/text_vol_up"
android:id="@+id/fragment_settings_apps_choose_vol_up_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10sp"
@ -132,10 +128,9 @@
android:textSize="20sp" />
<Button
android:id="@+id/btn_choose_volume_up"
android:id="@+id/fragment_settings_apps_choose_vol_up_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseVolumeUpApp"
android:text="@string/settings_choose_btn"
android:textAllCaps="false" />
</TableRow>
@ -146,7 +141,7 @@
android:gravity="center">
<TextView
android:id="@+id/text_vol_down"
android:id="@+id/fragment_settings_apps_choose_vol_down_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="10sp"
@ -155,10 +150,9 @@
android:textSize="20sp" />
<Button
android:id="@+id/btn_choose_volume_down"
android:id="@+id/fragment_settings_apps_choose_vol_down_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseVolumeDownApp"
android:text="@string/settings_choose_btn"
android:textAllCaps="false" />
@ -167,23 +161,23 @@
</TableLayout>
<Button
android:id="@+id/fragment_settings_apps_launch_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="chooseLaunchApp"
android:text="@string/settings_launch"
android:textAllCaps="false" />
<Button
android:id="@+id/fragment_settings_apps_install_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="chooseInstallApp"
android:text="@string/settings_install"
android:textAllCaps="false" />
<Button
android:id="@+id/fragment_settings_apps_remove_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="chooseUninstallApp"
android:text="@string/settings_uninstall"
android:textAllCaps="false" />
</LinearLayout>

21
app/src/main/res/layout/fragment_settings_launcher.xml → app/src/main/res/layout/fragment_settings_meta.xml
View file

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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/container"
android:id="@+id/fragment_settings_meta_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
@ -11,34 +12,34 @@
android:paddingTop="16sp"
android:paddingLeft="32sp"
android:paddingRight="32sp"
tools:context=".SettingsActivity">
tools:context=".settings.SettingsFragmentMeta">
<Button
android:id="@+id/fragment_settings_meta_select_launcher_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="setLauncher"
android:text="@string/settings_select_launcher"
android:textAllCaps="false" />
<Button
android:id="@+id/fragment_settings_meta_view_tutorial_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="viewTutorial"
android:text="@string/settings_show_tutorial"
android:textAllCaps="false" />
<Button
android:id="@+id/fragment_settings_meta_reset_settings_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32sp"
android:onClick="resetSettingsClick"
android:text="@string/settings_reset"
android:textAllCaps="false" />
<Button
android:id="@+id/fragment_settings_meta_rate_app_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="rateApp"
android:text="@string/settings_feedback"
android:textAllCaps="false" />
@ -49,21 +50,23 @@
android:orientation="horizontal">
<TextView
android:id="@+id/fragment_settings_meta_footer_by_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_footer_by"
android:textSize="18sp" />
<TextView
android:id="@+id/fragment_settings_meta_footer_website_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="openFinnWebsite"
android:text=" Finn M Glas"
android:textColor="?attr/colorAccent"
android:textSize="18sp"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/fragment_settings_meta_footer_pipe_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" | "
@ -71,9 +74,9 @@
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/fragment_settings_meta_footer_github_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="openGithubRepo"
android:text="Open Source"
android:textColor="?attr/colorAccent"
android:textSize="18sp"

28
app/src/main/res/layout/fragment_settings_theme.xml
View file

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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/container"
android:id="@+id/fragment_settings_theme_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
@ -11,7 +12,7 @@
android:paddingLeft="32sp"
android:paddingTop="16sp"
android:paddingRight="32sp"
tools:context=".SettingsActivity">
tools:context=".settings.SettingsFragmentMeta">
<ScrollView
android:layout_width="match_parent"
@ -30,21 +31,20 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorAccent">
android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:scaleType="fitXY"
app:srcCompat="@drawable/finnmglas_theme" />
app:srcCompat="@drawable/finnmglas_theme"
tools:ignore="ContentDescription" />
<Button
android:id="@+id/select_theme_finn"
android:id="@+id/fragment_settings_theme_select_finn_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseFinnTheme"
android:text="@string/settings_select_theme"
android:textAllCaps="false"
app:layout_constraintBottom_toBottomOf="parent"
@ -69,13 +69,13 @@
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:scaleType="fitXY"
app:srcCompat="@drawable/dark_theme" />
app:srcCompat="@drawable/dark_theme"
tools:ignore="ContentDescription" />
<Button
android:id="@+id/select_theme_dark"
android:id="@+id/fragment_settings_theme_select_dark_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseDarkTheme"
android:text="@string/settings_select_theme"
android:textAllCaps="false"
app:layout_constraintBottom_toBottomOf="parent"
@ -99,13 +99,13 @@
android:layout_height="match_parent"
android:adjustViewBounds="true"
android:scaleType="fitXY"
app:srcCompat="@drawable/custom_theme" />
app:srcCompat="@drawable/custom_theme"
tools:ignore="ContentDescription" />
<Button
android:id="@+id/select_theme_custom"
android:id="@+id/fragment_settings_theme_select_custom_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="chooseCustomTheme"
android:text="@string/settings_select_theme"
android:textAllCaps="false"
app:layout_constraintBottom_toBottomOf="parent"