xml refactoring and added a privacy policy

This commit is contained in:
ottoptj 2024-08-10 20:33:57 +03:00
commit 8ee1d67eb3
34 changed files with 172 additions and 179 deletions

View file

@ -2,7 +2,7 @@
<FrameLayout 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/main_view"
android:id="@+id/mainView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="fill_vertical"
@ -10,7 +10,7 @@
tools:context=".MainActivity">
<LinearLayout
android:id="@+id/app_view"
android:id="@+id/appView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
@ -22,7 +22,7 @@
android:layout_height="60dp" />
<TextView
android:id="@+id/menutitle"
android:id="@+id/menuTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
@ -37,7 +37,7 @@
android:textSize="36sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
@ -53,7 +53,6 @@
android:id="@+id/searchView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="10dp"
@ -72,7 +71,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/home_view"
android:id="@+id/homeView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="fill_vertical"
@ -81,12 +80,12 @@
android:visibility="visible">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clock_layout"
android:id="@+id/clockLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextClock
android:id="@+id/text_clock"
android:id="@+id/textClock"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="32dp"
@ -95,7 +94,6 @@
android:fontFamily="@null"
android:format12Hour="hh:mm a"
android:format24Hour="HH:mm"
android:gravity="bottom"
android:textAlignment="textStart"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3"
@ -106,7 +104,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextClock
android:id="@+id/text_date"
android:id="@+id/textDate"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="@null"
@ -118,9 +116,9 @@
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="@+id/text_clock"
app:layout_constraintStart_toStartOf="@+id/text_clock"
app:layout_constraintTop_toBottomOf="@+id/text_clock" />
app:layout_constraintEnd_toEndOf="@+id/textClock"
app:layout_constraintStart_toStartOf="@+id/textClock"
app:layout_constraintTop_toBottomOf="@+id/textClock" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -1,16 +1,15 @@
<?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/settingsLayout"
android:id="@+id/settingsActivity"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".SettingsActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/settings_layout"
android:id="@+id/settingsLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="40dp">

View file

@ -1,22 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout 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_item"
android:id="@+id/listItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="0dp">
<LinearLayout
android:id="@+id/rename_view"
android:id="@+id/renameView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="10dp"
android:visibility="invisible">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/app_name_edit"
android:id="@+id/appNameEdit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -44,13 +43,13 @@
android:gravity="center"
android:insetTop="0dp"
android:insetBottom="0dp"
android:text="Reset"
android:text="@string/reset"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3" />
</LinearLayout>
<TextView
android:id="@+id/app_name"
android:id="@+id/appName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
@ -67,7 +66,7 @@
app:drawableLeftCompat="@drawable/ic_work_app" />
<LinearLayout
android:id="@+id/action_menu"
android:id="@+id/actionMenu"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
@ -80,7 +79,7 @@
android:layout_weight="1"
android:background="#A7000000"
android:foreground="@drawable/app_action_foreground"
android:text="Info"
android:text="@string/info"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3FF"
@ -93,7 +92,7 @@
android:layout_weight="1"
android:background="#A7000000"
android:foreground="@drawable/app_action_foreground"
android:text="Uninstall"
android:text="@string/uninstall"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3FF"
@ -106,7 +105,7 @@
android:layout_weight="1"
android:background="#A7000000"
android:foreground="@drawable/app_action_foreground"
android:text="Rename"
android:text="@string/rename"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3FF"
@ -119,7 +118,7 @@
android:layout_weight="1"
android:background="#A7000000"
android:foreground="@drawable/app_action_foreground"
android:text="Hide"
android:text="@string/hide"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3FF"
@ -132,7 +131,7 @@
android:layout_weight="1"
android:background="#A7000000"
android:foreground="@drawable/app_action_foreground"
android:text="Close"
android:text="@string/close"
android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#F3F3F3FF"

View file

@ -2,7 +2,7 @@
<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/frameLayout"
android:id="@+id/aboutLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".AboutFragment">
@ -11,13 +11,14 @@
android:id="@+id/imageView"
android:layout_width="0dp"
android:layout_height="200dp"
android:contentDescription="@string/app_icon"
android:src="@drawable/ic_launcher_foreground"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView2"
android:id="@+id/appNameView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/app_name"
@ -32,18 +33,18 @@
android:id="@+id/creditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="By Otto Petäjä"
android:text="@string/creditName"
android:textSize="17sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/textView2"
app:layout_constraintTop_toBottomOf="@+id/textView2" />
app:layout_constraintStart_toStartOf="@+id/appNameView"
app:layout_constraintTop_toBottomOf="@+id/appNameView" />
<TextView
android:id="@+id/sourceTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:text="Source Code"
android:text="@string/source_code"
android:textAlignment="center"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
@ -66,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:linksClickable="true"
android:text="Codeberg"
android:text="@string/codeberg"
android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintEnd_toStartOf="@+id/githubLink"
@ -79,7 +80,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:linksClickable="true"
android:text="GitHub"
android:text="@string/github"
android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
@ -91,7 +92,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:text="Donate"
android:text="@string/donate"
android:textAlignment="center"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
@ -114,7 +115,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:linksClickable="true"
android:text="Stripe"
android:text="@string/stripe"
android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
@ -127,7 +128,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:linksClickable="true"
android:text="Liberapay"
android:text="@string/liberapay"
android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintEnd_toStartOf="@+id/stripeLink"
@ -140,7 +141,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:linksClickable="true"
android:text="Weather data by Open-Meteo.com\n(CC BY 4.0)"
android:text="@string/weather_data_credit"
android:textAlignment="center"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"

View file

@ -2,7 +2,7 @@
<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/gesture_app_view"
android:id="@+id/gestureAppView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
@ -13,7 +13,7 @@
android:layout_height="60dp" />
<TextView
android:id="@+id/gesture_menutitle"
android:id="@+id/gestureMenuTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
@ -28,7 +28,7 @@
android:textSize="36sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/gesture_app_recycler"
android:id="@+id/gestureAppRecycler"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"

View file

@ -2,7 +2,7 @@
<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/hidden_app_view"
android:id="@+id/hiddenAppView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
@ -14,7 +14,7 @@
android:layout_height="60dp" />
<TextView
android:id="@+id/hidden_menutitle"
android:id="@+id/hiddenMenuTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
@ -23,13 +23,13 @@
android:paddingTop="20dp"
android:paddingRight="40dp"
android:paddingBottom="20dp"
android:text="Unhide an app"
android:text="@string/unhide_an_app"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#C1F3F3F3"
android:textSize="36sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/hidden_app_recycler"
android:id="@+id/hiddenAppRecycler"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"

View file

@ -2,7 +2,7 @@
<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/manual_location_view"
android:id="@+id/manualLocationView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
@ -14,7 +14,7 @@
android:layout_height="60dp" />
<TextView
android:id="@+id/location_menutitle"
android:id="@+id/locationMenuTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
@ -23,13 +23,13 @@
android:paddingTop="20dp"
android:paddingRight="40dp"
android:paddingBottom="20dp"
android:text="Find your city"
android:text="@string/find_your_city"
android:textAppearance="@android:style/TextAppearance.DeviceDefault"
android:textColor="#C1F3F3F3"
android:textSize="36sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/locationrecycler"
android:id="@+id/locationRecycler"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
@ -70,7 +70,7 @@
android:layout_marginTop="0dp"
android:layout_marginBottom="15dp"
android:linksClickable="true"
android:text="Weather data by Open-Meteo.com\n(CC BY 4.0)"
android:text="@string/weather_data_credit"
android:textAlignment="center"
android:textColor="#B3A5A5A5"
android:textColorLink="#7F80CBC4"

View file

@ -1,13 +1,12 @@
<?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:tools="http://schemas.android.com/tools"
android:id="@+id/location_place"
android:id="@+id/locationPlace"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/location_name"
android:id="@+id/locationName"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:clickable="false"
@ -26,7 +25,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/region_name"
android:id="@+id/regionName"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:clickable="false"
@ -40,8 +39,8 @@
android:textColor="#C3C3C3"
android:textSize="14sp"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="@+id/location_name"
app:layout_constraintEnd_toEndOf="@+id/locationName"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/location_name" />
app:layout_constraintTop_toBottomOf="@+id/locationName" />
</androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation 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/nav_graph" />

View file

@ -1,3 +0,0 @@
<resources>
<dimen name="fab_margin">48dp</dimen>
</resources>

View file

@ -1,4 +0,0 @@
<resources xmlns:tools="http://schemas.android.com/tools">
</resources>

View file

@ -1,3 +0,0 @@
<resources xmlns:tools="http://schemas.android.com/tools">
</resources>

View file

@ -1,3 +0,0 @@
<resources>
<dimen name="fab_margin">200dp</dimen>
</resources>

View file

@ -1,3 +0,0 @@
<resources>
<dimen name="fab_margin">48dp</dimen>
</resources>

View file

@ -1,13 +1,39 @@
<resources>
<!-- Reply Preference -->
<string-array name="reply_entries">
<item>Reply</item>
<item>Reply to all</item>
<string-array name="shortcut_options">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
<string-array name="reply_values">
<item>reply</item>
<item>reply_all</item>
<string-array name="bg_options">
<item>Transparent</item>
<item>Black</item>
<item>Grey</item>
<item>White</item>
</string-array>
<string-array name="bg_values">
<item>#00000000</item>
<item>#FF000000</item>
<item>#FF1B1B1B</item>
<item>#FFD6D6D6</item>
</string-array>
<string-array name="color_options">
<item>Light</item>
<item>Dark</item>
</string-array>
<string-array name="color_values">
<item>#FFF3F3F3</item>
<item>#FF0C0C0C</item>
</string-array>
<string-array name="h_alignment_options">
@ -43,40 +69,4 @@
<item>celsius</item>
<item>fahrenheit</item>
</string-array>
<string-array name="bg_options">
<item>Transparent</item>
<item>Black</item>
<item>Grey</item>
<item>White</item>
</string-array>
<string-array name="bg_values">
<item>#00000000</item>
<item>#FF000000</item>
<item>#FF1B1B1B</item>
<item>#FFD6D6D6</item>
</string-array>
<string-array name="color_options">
<item>Light</item>
<item>Dark</item>
</string-array>
<string-array name="color_values">
<item>#FFF3F3F3</item>
<item>#FF0C0C0C</item>
</string-array>
<string-array name="shortcut_options">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
</resources>

View file

@ -1,3 +0,0 @@
<resources>
<dimen name="fab_margin">16dp</dimen>
</resources>

View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="app_name_edit" type="id" />
</resources>

View file

@ -3,17 +3,30 @@
<string name="empty"></string>
<string name="select_an_app">Select an app</string>
<string name="search">Search…</string>
<string name="app">App</string>
<string name="shortcut_default">App</string>
<!-- Sync Preferences -->
<string name="sync_title">Sync email periodically</string>
<string name="attachment_title">Download incoming attachments</string>
<string name="attachment_summary_on">Automatically download attachments for incoming emails
</string>
<string name="attachment_summary_off">Only download attachments when manually requested</string>
<string name="select_an_app">Select an app</string>
<string name="unhide_an_app">Unhide an app</string>
<string name="find_your_city">Find your city</string>
<string name="search">Search…</string>
<string name="reset">Reset</string>
<string name="info">Info</string>
<string name="uninstall">Uninstall</string>
<string name="rename">Rename</string>
<string name="hide">Hide</string>
<string name="close">Close</string>
<string name="app_icon">App Icon</string>
<string name="creditName">By Otto Petäjä</string>
<string name="source_code">Source Code</string>
<string name="codeberg">Codeberg</string>
<string name="github">GitHub</string>
<string name="donate">Donate</string>
<string name="stripe">Stripe</string>
<string name="liberapay">Liberapay</string>
<string name="weather_data_credit">Weather data by Open-Meteo.com\n(CC BY 4.0)</string>
<string name="my_website_link"><![CDATA[by <a href="https://ottop.eu">Otto Petäjä</a>]]></string>
@ -25,7 +38,9 @@
<string name="weather_link"><![CDATA[Weather data by <a href="https://open-meteo.com/">Open-Meteo.com</a><br>(<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>)]]></string>
<string name="location_link"><![CDATA[Location data by <a href="https://open-meteo.com/">Open-Meteo.com</a> (<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>)]]></string>
<string name="accessibility_service_description">Idk this is my service</string>
<string name="region_text">%1$s%2$s</string>
<string name="accessibility_service_description">The permission is required for double tap to work for locking the screen.\n\nIt is only needed if you want to use the double tap to lock screen feature in YAM Launcher.</string>
</resources>

View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<accessibility-service
xmlns:android="http://schemas.android.com/apk/res/android"
android:description="@string/accessibility_service_description"
android:accessibilityEventTypes="typeViewClicked"
android:accessibilityFeedbackType="feedbackGeneric"
android:notificationTimeout="100"
android:canRetrieveWindowContent="true"
android:description="@string/accessibility_service_description" />
android:settingsActivity="eu.ottop.yamlauncher.SettingsActivity"/>