diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..b589d56 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..7e340a7 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index c75a163..e9d20d9 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,7 +9,7 @@ - + diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 0000000..0d3a1fb --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,263 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 1186590..3d14449 100644 --- a/README.md +++ b/README.md @@ -6,239 +6,38 @@ -# Launcher :rocket: +# Launcher -**`English` | [`Deutsch`](#de) | [`Français`](#fr) | [`Español`](#es)** - -## Concept -_Launcher_ is an android homescreen that lets you start other apps efficiently using swipe gestures and button presses. It is **minimal, efficient and free of distraction**. - -Your homescreen only displays the date, time and a wallpaper (if you want one). - -This app **costs you nothing**, is **ad-free** and does not collect, receive or share any personal data. It boosts your efficiency, no matter who you are! - -So make the best of your time on the phone by downloading this Launcher: - -[Get it on Google Play][store-googleplay-badgecampain] -[Get on F-Droid][store-fdroid] - -## Contributing -If _Launcher_ is useful to you, you are very welcome to help developing it! Join our [discord]! - -### Testing -The easiest way to help improving this app is downloading it and testing. We need lots of feedback from you: You can either [review Launcher][store-googleplay] on Google Play or [open an issue][newissue] on GitHub. - -### GitHub - -Even if you can't find time for other contributions (code, feedback), please make sure to star _Launcher_, as it helps other developers and users find the app easier ^^ - -[![][shield-gh-star]][star] - -### Contributing Code - -To help developing Launcher, you will need a GitHub account ([create one][joingh]). - -1. Create a fork of this repository.

[![][shield-gh-fork]][fork] - -2. Create a new branch called `feature/[feature-name]` or `fix/[what-you-fix]`. - -3. Commit your changes, fixes or improvements to the new branch. - -4. Open a new pull request to the `master` branch of this repository. - -### Sponsor :heart: - -As the app is 100% free to the public, fees for distribution et cetera are paid by the developer himself. If _Launcher_ is valuable enough to you, you can also [support the project financially][financial] - **you as a sponsor make open-source possible in the first place!** +This is a fork of [finnmglas' Launcher][original-repo]. +There are only some small changes: +* The font has been changed to [Hack][hack-font]. +* The search algorithm was modified to prefer +* small improvement of gesture detection. --- - - - -# Launcher :rocket: - -**[`English`](#en) | `Deutsch` | [`Français`](#fr) | [`Español`](#es)** - -## Konzept -_Launcher_ ist ein Startbildschirm für Android, der dir hilft, andere Apps durch Wischbewegungen und die Tasten deines Smartphones schnell andere Apps starten lässt. Er ist **minimal, effizient und frei von Ablenkung**. - -Dein Startbildschirm zeigt nur Datum, Uhrzeit und ein Hintergrundbild (wenn du willst) an. - -Die App **kostet dich nichts**, ist **frei von Werbung** und sammelt keine persönlichen Daten. Launcher hilft dir effizienter zu sein, egal wer du bist! - -Mache das Beste aus deiner Zeit am Smartphone indem du diesen Launcher installierst: - -[Get it on Google Play][store-googleplay-badgecampain] -[Get on F-Droid][store-fdroid-de] - -## Mitwirkungen -Wenn _Launcher_ für dich nützlich ist, darfst du gerne auch bei der Entwicklung mithelfen! Schau einfach mal im [Launcher Discord][discord] vorbei (dort sprechen wir Englisch)! - -### Testen -Am Einfachsten kannst du mithelfen, indem die die App herunterlädst und sie testest. Wir brauchen viel Feedback von dir: Du kannst entweder [eine Revision][store-googleplay] im Play-Store hinterlassen oder [ein Issue auf GitHub eröffnen][newissue]. - -### GitHub - -Auch wenn du keine Zeit findest um mitzuwirken (Code, Feedback), kannst du _Launcher_ auf GitHub mit einem Stern markieren, da das anderen Entwicklern und Nutzern dabei hilft, diese App leichter zu finden ^^ - -[![][shield-gh-star]][star] - -### Code einsenden - -Um bei der Entwicklung von Launcher zu helfen, benötigst du einen GitHub Account ([erstelle einen][joingh]). - -1. Erstelle ein fork dieses Repositories.

[![][shield-gh-fork]][fork] - -2. Erstelle einen neuen Branch mit einem Namen wie`feature/[feature-name]` oder `fix/[what-you-fix]`. - -3. Commite deine Änderungen, Fixes oder Verbesserungen auf dem neuen Branch. - -4. Öffne eine neue Pull Request zum `master` Branch dieses Repositories. - -### Finanzielle Unterstützung :heart: - -Da diese App 100% gratis für jeden ist, werden Kosten für die Verbreitung, Entwicklung et cetera vom Entwickler übernommen. Wenn _Launcher_ für dich wertvoll ist, kannst du ihn auch [finanziell unterstützen][financial] - **du als Sponsor machst Open-Source erst möglich!** - --- + [hack-font]: https://sourcefoundry.org/hack/ + [original-repo]: https://github.com/finnmglas/Launcher - - -# Launcher :rocket: - -**[`English`](#en) | [`Deutsch`](#de) | `Français` | [`Español`](#es)** - -## Concept -_Launcher_ est un écran d'accueil Android qui vous permet de démarrer efficacement d'autres applications en utilisant des gestes de balayage et des pressions sur des boutons. Il est **minimal, efficace et sans distraction**. - -Votre écran d'accueil affiche uniquement la date, l'heure et un fond d'écran (si vous en voulez un). - -Cette application **ne vous coûte rien**, est **sans publicité** et ne collecte, ne reçoit ni ne partage aucune donnée personnelle. Cela booste votre efficacité, peu importe qui vous êtes! - -Alors profitez au mieux de votre temps au téléphone en téléchargeant ce lanceur: - -[Get it on Google Play][store-googleplay-badgecampain] -[Get on F-Droid][store-fdroid-fr] - -## Contribuant -Si _Launcher_ vous est utile, vous êtes les bienvenus pour contribuer à son développement! Rejoignez le [Launcher Discord][discord] (on y parle anglais)! - -### Tester -Le moyen le plus simple d'aider à améliorer cette application est de la télécharger et de la tester. Nous avons besoin de beaucoup de commentaires de votre part: vous pouvez [réviser Launcher][store-googleplay] sur Google Play ou [ouvrir un issue][newissue] sur GitHub. - - -### GitHub - -Même si vous ne trouvez pas de temps pour d'autres contributions (code, réviser), assurez-vous de mettre _Launcher_ en étoile, car cela aide les autres développeurs et utilisateurs à trouver l'application plus facilement ^^ - -[![][shield-gh-star]][star] - -### Code contributeur - -Pour aider à développer Launcher, vous aurez besoin d'un compte GitHub ([créer un][joingh]). - -1. Créer un fork de ce repo.

[![][shield-gh-fork]][fork] - -2. Créez une nouvelle branche appelée `feature/[feature-name]` or `fix/[what-you-fix]`. - -3. Validez vos modifications, corrections ou améliorations dans la nouvelle branche. - -4. Ouvrez une nouvelle pull request dans la branche `master` de ce repo. - -### Sponsoriser :heart: - -Comme l'application est 100% gratuite pour le public, les frais de distribution, etc. sont payés par le développeur lui-même. Si _Launcher_ est assez précieux pour vous, vous pouvez également [soutenir le projet financièrement][financial] - **vous, en tant que sponsor, rendez l'open-source possible en premier lieu!** - ---- - - - -# Launcher :rocket: - -**[`English`](#en) | [`Deutsch`](#de) | [`Français`](#fr) | `Español`** - -## Concepto -_Launcher_ es una pantalla de inicio para android que permite iniciar otras aplicaciones de forma eficiente mediante gestos de deslizar y presionar en la pantalla. Es **minimalista, eficiente y libre de distracciones**. - -La pantalla de inicio solo muestra la fecha, hora y un fondo de pantalla (si se desea uno). - -Esta aplicación **no cuesta nada**, es **libre de anuncios** y no recopila, recibe o comparte información personal. Mejora tu eficiencia, sin importar quién seas! - -Así que haz el mejor uso posible de tu tiempo con tu smartphone descargando este Launcher: - -[Get it on Google Play][store-googleplay-badgecampain] -[Get on F-Droid][store-fdroid] - -## Contribuciones -Si _Launcher_ te resulta útil, tu ayuda en su desarrollo será muy bienvenida! Únete a nuestro [discord]! - -### Testing -La forma más simple de mejorar la aplicación es descargándola y probándola. Necesitamos mucha ayuda de ti: Puedes [escribir una reseña][store-googleplay] en Google Play o [abrir un issue][newissue] en GitHub. - -### GitHub - -Incluso si no puedes hacerte un tiempo para otras contribuciones (código, reseñas), por favor asegúrate de darle una estrella a _Launcher_, y así ayudar a que otros desarrolladores y usuarios encuentren la app más fácilmente ^^ - -[![][shield-gh-star]][star] - -### Contribuciones de Código - -Para ayudar con el desarrollo de Launcher, necesitarás una cuenta de GitHub ([crea una][joingh]). - -1. Crea un fork de este repositorio.

[![][shield-gh-fork]][fork] - -2. Crea una nueva rama llamada `feature/[feature-name]` o `fix/[what-you-fix]`. - -3. Commitear tus cambios, soluciones o mejoras a la rama nueva. - -4. Abrir una nueva pull request a la rama `master` de este repositorio. - -### Patrocinar :heart: - -Como la aplicación es 100% gratuita, los costos de distribución et cetera son pagados por el desarrollador. Si _Launcher_ es lo suficientemente valioso para ti, puedes [apoyar el proyecto financieramente][financial] - **tú como patrocinador haces que el software de código abierto sea posible en primer lugar!** - ---- - - - - [shield-discord]: https://img.shields.io/badge/discord-join%20chat-007ec6.svg?style=flat - [discord]: https://discord.com/invite/jV2AhF8 - [store-googleplay]: https://play.google.com/store/apps/details?id=com.finnmglas.launcher - [store-googleplay-badgecampain]: https://play.google.com/store/apps/details?id=com.finnmglas.launcher&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1 - [store-fdroid]: https://f-droid.org/packages/com.finnmglas.launcher/ - [store-fdroid-de]: https://f-droid.org/de/packages/com.finnmglas.launcher/ - [store-fdroid-fr]: https://f-droid.org/fr/packages/com.finnmglas.launcher/ - - - - [financial]: https://sponsor.finnmglas.com - - - - [fork]: https://github.com/finnmglas/Launcher/fork - [star]: https://github.com/finnmglas/Launcher/stargazers - - [joingh]: https://github.com/join - - [newissue]: https://github.com/finnmglas/Launcher/issues/new/choose - [issues]: https://github.com/finnmglas/Launcher/issues - [contributors]: https://github.com/finnmglas/Launcher/graphs/contributors - - [theme-examples]: https://github.com/finnmglas/Launcher/blob/master/docs/README.md - - [latest-release]: https://github.com/finnmglas/Launcher/releases/latest + [store-googleplay]: https://play.google.com/store/apps/details?id=de.jrpie.android.launcher + [store-googleplay-badgecampain]: https://play.google.com/store/apps/details?id=de.jrpie.android.launcher&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1 + [store-fdroid]: https://f-droid.org/packages/de.jrpie.android.launcher/ - [shield-release]: https://img.shields.io/github/v/release/finnmglas/Launcher?style=flat + [shield-release]: https://img.shields.io/github/v/release/jrpie/Launcher?style=flat [shield-contribute]: https://img.shields.io/badge/contributions-welcome-007ec6.svg?style=flat [shield-license]: https://img.shields.io/badge/license-MIT-007ec6?style=flat - [shield-gh-watch]: https://img.shields.io/github/watchers/finnmglas/Launcher?label=Watch&style=social - [shield-gh-star]: https://img.shields.io/github/stars/finnmglas/Launcher?label=Star&style=social - [shield-gh-fork]: https://img.shields.io/github/forks/finnmglas/Launcher?label=Fork&style=social + [shield-gh-watch]: https://img.shields.io/github/watchers/jrpie/Launcher?label=Watch&style=social + [shield-gh-star]: https://img.shields.io/github/stars/jrpie/Launcher?label=Star&style=social + [shield-gh-fork]: https://img.shields.io/github/forks/jrpie/Launcher?label=Fork&style=social + + - [license]: https://github.com/finnmglas/Launcher/blob/master/LICENSE + [license]: https://github.com/jrpie/Launcher/blob/master/LICENSE diff --git a/app/build.gradle b/app/build.gradle index 739d6a6..4069464 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,15 +3,15 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + compileSdkVersion 33 + buildToolsVersion "30.0.3" defaultConfig { - applicationId "com.finnmglas.launcher" + applicationId "de.jrpie.android.launcher" minSdkVersion 16 - targetSdkVersion 29 - versionCode 12 - versionName "v1.6.0" + targetSdkVersion 33 + versionCode 13 + versionName "j-alpha-0.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..69f1038 --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "de.jrpie.android.launcher", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 12, + "versionName": "v1.6.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/finnmglas/launcher/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/finnmglas/launcher/ExampleInstrumentedTest.kt deleted file mode 100644 index 157777b..0000000 --- a/app/src/androidTest/java/com/finnmglas/launcher/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.finnmglas.launcher - -import androidx.test.platform.app.InstrumentationRegistry -import androidx.test.ext.junit.runners.AndroidJUnit4 - -import org.junit.Test -import org.junit.runner.RunWith - -import org.junit.Assert.* - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.finnmglas.launcher", appContext.packageName) - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5eae4e4..5b04e98 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="de.jrpie.android.launcher"> diff --git a/app/src/main/java/com/finnmglas/launcher/Functions.kt b/app/src/main/java/de/jrpie/android/launcher/Functions.kt similarity index 98% rename from app/src/main/java/com/finnmglas/launcher/Functions.kt rename to app/src/main/java/de/jrpie/android/launcher/Functions.kt index d7e0635..52251f3 100644 --- a/app/src/main/java/com/finnmglas/launcher/Functions.kt +++ b/app/src/main/java/de/jrpie/android/launcher/Functions.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher +package de.jrpie.android.launcher import android.app.Activity import android.app.AlertDialog @@ -25,12 +25,12 @@ import android.widget.Button import android.widget.ImageView import android.widget.Switch import android.widget.Toast -import com.finnmglas.launcher.list.ListActivity -import com.finnmglas.launcher.list.apps.AppInfo -import com.finnmglas.launcher.list.apps.AppsRecyclerAdapter -import com.finnmglas.launcher.settings.SettingsActivity -import com.finnmglas.launcher.settings.intendedSettingsPause -import com.finnmglas.launcher.tutorial.TutorialActivity +import de.jrpie.android.launcher.list.ListActivity +import de.jrpie.android.launcher.list.apps.AppInfo +import de.jrpie.android.launcher.list.apps.AppsRecyclerAdapter +import de.jrpie.android.launcher.settings.SettingsActivity +import de.jrpie.android.launcher.settings.intendedSettingsPause +import de.jrpie.android.launcher.tutorial.TutorialActivity import kotlin.math.roundToInt diff --git a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt b/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt similarity index 88% rename from app/src/main/java/com/finnmglas/launcher/HomeActivity.kt rename to app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt index 5fed5d3..683ce3a 100644 --- a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher +package de.jrpie.android.launcher import android.content.Context import android.content.Intent @@ -9,13 +9,13 @@ import android.provider.MediaStore import android.view.* import androidx.appcompat.app.AppCompatActivity import androidx.core.view.GestureDetectorCompat -import com.finnmglas.launcher.tutorial.TutorialActivity +import de.jrpie.android.launcher.tutorial.TutorialActivity import kotlinx.android.synthetic.main.home.* import java.text.SimpleDateFormat import java.util.* import kotlin.concurrent.fixedRateTimer import kotlin.math.abs -import com.finnmglas.launcher.BuildConfig.VERSION_NAME +import de.jrpie.android.launcher.BuildConfig.VERSION_NAME /** * [HomeActivity] is the actual application Launcher, @@ -134,7 +134,8 @@ class HomeActivity: UIObject, AppCompatActivity(), } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { - if (keyCode == KeyEvent.KEYCODE_BACK) { if (settingsIconShown) hideSettingsIcon() } + if (keyCode == KeyEvent.KEYCODE_BACK) { + launch("launcher:choose", this) } else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) launch(volumeUpApp, this,0, 0) else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) @@ -194,34 +195,10 @@ class HomeActivity: UIObject, AppCompatActivity(), // Tooltip override fun onSingleTapConfirmed(event: MotionEvent): Boolean { - when(settingsIconShown) { - true -> { - hideSettingsIcon() - } - false -> {showSettingsIcon()} - } + return false } - private fun showSettingsIcon(){ - if(!canReachSettings()) { - home_settings_icon.fadeRotateIn() - home_settings_icon.visibility = View.VISIBLE - settingsIconShown = true - - tooltipTimer = fixedRateTimer("tooltipTimer", true, 10000, 1000) { - this@HomeActivity.runOnUiThread { hideSettingsIcon() } - } - } - } - - private fun hideSettingsIcon(){ - tooltipTimer.cancel() - home_settings_icon.fadeRotateOut() - home_settings_icon.visibility = View.INVISIBLE - settingsIconShown = false - } - override fun onTouchEvent(event: MotionEvent): Boolean { // Buffer / Debounce the pointer count @@ -237,10 +214,7 @@ class HomeActivity: UIObject, AppCompatActivity(), } override fun applyTheme() { - // Start by showing the settings icon - if (!settingsIconShown) showSettingsIcon() - home_settings_icon.setTextColor(vibrantColor) home_container.setBackgroundColor(dominantColor) if (launcherPreferences.getString(PREF_WALLPAPER, "") != "") { @@ -262,9 +236,6 @@ class HomeActivity: UIObject, AppCompatActivity(), } override fun setOnClicks() { - home_settings_icon.setOnClickListener() { - launch("launcher:settings", this, R.anim.bottom_up) - } home_upper_view.setOnClickListener() { when (launcherPreferences.getInt(PREF_DATE_FORMAT, 0)) { diff --git a/app/src/main/java/com/finnmglas/launcher/UIObject.kt b/app/src/main/java/de/jrpie/android/launcher/UIObject.kt similarity index 94% rename from app/src/main/java/com/finnmglas/launcher/UIObject.kt rename to app/src/main/java/de/jrpie/android/launcher/UIObject.kt index 300a335..3f07b42 100644 --- a/app/src/main/java/com/finnmglas/launcher/UIObject.kt +++ b/app/src/main/java/de/jrpie/android/launcher/UIObject.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher +package de.jrpie.android.launcher import android.app.Activity import android.view.WindowManager diff --git a/app/src/main/java/com/finnmglas/launcher/libraries/FontAwesome.kt b/app/src/main/java/de/jrpie/android/launcher/libraries/FontAwesome.kt similarity index 94% rename from app/src/main/java/com/finnmglas/launcher/libraries/FontAwesome.kt rename to app/src/main/java/de/jrpie/android/launcher/libraries/FontAwesome.kt index 99cbf71..2ae863b 100644 --- a/app/src/main/java/com/finnmglas/launcher/libraries/FontAwesome.kt +++ b/app/src/main/java/de/jrpie/android/launcher/libraries/FontAwesome.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.libraries // replace with your package +package de.jrpie.android.launcher.libraries // replace with your package // On GitHub: https://github.com/finnmglas/fontawesome-android @@ -6,7 +6,7 @@ import android.content.Context import android.graphics.Typeface import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView -import com.finnmglas.launcher.R +import de.jrpie.android.launcher.R /** [FontAwesome] is just a type of TextView with special functions: * diff --git a/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt b/app/src/main/java/de/jrpie/android/launcher/list/ListActivity.kt similarity index 93% rename from app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt rename to app/src/main/java/de/jrpie/android/launcher/list/ListActivity.kt index f1c3af4..fc04131 100644 --- a/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/ListActivity.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.list +package de.jrpie.android.launcher.list import android.app.Activity import android.content.Intent @@ -7,16 +7,16 @@ import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.viewpager.widget.ViewPager -import com.finnmglas.launcher.* -import com.finnmglas.launcher.settings.intendedSettingsPause +import de.jrpie.android.launcher.* +import de.jrpie.android.launcher.settings.intendedSettingsPause import com.google.android.material.tabs.TabLayout import kotlinx.android.synthetic.main.list.* import android.content.Context import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -import com.finnmglas.launcher.list.apps.ListFragmentApps -import com.finnmglas.launcher.list.other.ListFragmentOther +import de.jrpie.android.launcher.list.apps.ListFragmentApps +import de.jrpie.android.launcher.list.other.ListFragmentOther import kotlinx.android.synthetic.main.home.* import kotlinx.android.synthetic.main.list_apps.* @@ -129,7 +129,7 @@ class ListSectionsPagerAdapter(private val context: Context, fm: FragmentManager override fun getItem(position: Int): Fragment { return when (position){ 0 -> ListFragmentApps() - 1 -> ListFragmentOther() + 1 -> de.jrpie.android.launcher.list.other.ListFragmentOther() else -> Fragment() } } diff --git a/app/src/main/java/com/finnmglas/launcher/list/apps/AppInfo.kt b/app/src/main/java/de/jrpie/android/launcher/list/apps/AppInfo.kt similarity index 88% rename from app/src/main/java/com/finnmglas/launcher/list/apps/AppInfo.kt rename to app/src/main/java/de/jrpie/android/launcher/list/apps/AppInfo.kt index 1122df7..0c99757 100644 --- a/app/src/main/java/com/finnmglas/launcher/list/apps/AppInfo.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/apps/AppInfo.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.list.apps +package de.jrpie.android.launcher.list.apps import android.graphics.drawable.Drawable diff --git a/app/src/main/java/com/finnmglas/launcher/list/apps/AppsRecyclerAdapter.kt b/app/src/main/java/de/jrpie/android/launcher/list/apps/AppsRecyclerAdapter.kt similarity index 97% rename from app/src/main/java/com/finnmglas/launcher/list/apps/AppsRecyclerAdapter.kt rename to app/src/main/java/de/jrpie/android/launcher/list/apps/AppsRecyclerAdapter.kt index cdc2563..daa7e84 100644 --- a/app/src/main/java/com/finnmglas/launcher/list/apps/AppsRecyclerAdapter.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/apps/AppsRecyclerAdapter.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.list.apps +package de.jrpie.android.launcher.list.apps import android.app.Activity import android.content.Context @@ -14,9 +14,9 @@ import android.widget.ImageView import android.widget.PopupMenu import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.finnmglas.launcher.* -import com.finnmglas.launcher.libraries.FontAwesome -import com.finnmglas.launcher.list.intendedChoosePause +import de.jrpie.android.launcher.* +import de.jrpie.android.launcher.libraries.FontAwesome +import de.jrpie.android.launcher.list.intendedChoosePause import java.util.* import kotlin.collections.ArrayList diff --git a/app/src/main/java/com/finnmglas/launcher/list/apps/ListFragmentApps.kt b/app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt similarity index 92% rename from app/src/main/java/com/finnmglas/launcher/list/apps/ListFragmentApps.kt rename to app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt index 88c2419..bc7b8db 100644 --- a/app/src/main/java/com/finnmglas/launcher/list/apps/ListFragmentApps.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.list.apps +package de.jrpie.android.launcher.list.apps import android.os.Bundle import android.view.LayoutInflater @@ -6,9 +6,9 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.finnmglas.launcher.* -import com.finnmglas.launcher.list.forApp -import com.finnmglas.launcher.list.intention +import de.jrpie.android.launcher.* +import de.jrpie.android.launcher.list.forApp +import de.jrpie.android.launcher.list.intention import kotlinx.android.synthetic.main.list.* import kotlinx.android.synthetic.main.list_apps.* diff --git a/app/src/main/java/com/finnmglas/launcher/list/other/ListFragmentOther.kt b/app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt similarity index 82% rename from app/src/main/java/com/finnmglas/launcher/list/other/ListFragmentOther.kt rename to app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt index 3641234..f8ca74c 100644 --- a/app/src/main/java/com/finnmglas/launcher/list/other/ListFragmentOther.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.list.other +package de.jrpie.android.launcher.list.other import android.os.Bundle import android.view.LayoutInflater @@ -6,9 +6,9 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.finnmglas.launcher.R -import com.finnmglas.launcher.dominantColor -import com.finnmglas.launcher.getSavedTheme +import de.jrpie.android.launcher.R +import de.jrpie.android.launcher.dominantColor +import de.jrpie.android.launcher.getSavedTheme import kotlinx.android.synthetic.main.list_other.* /** @@ -33,7 +33,7 @@ class ListFragmentOther : Fragment() { // set up the list / recycler val viewManager = LinearLayoutManager(context) - val viewAdapter = OtherRecyclerAdapter(activity!!) + val viewAdapter = de.jrpie.android.launcher.list.other.OtherRecyclerAdapter(activity!!) list_other_rview.apply { // improve performance (since content changes don't change the layout size) diff --git a/app/src/main/java/com/finnmglas/launcher/list/other/OtherInfo.kt b/app/src/main/java/de/jrpie/android/launcher/list/other/OtherInfo.kt similarity index 90% rename from app/src/main/java/com/finnmglas/launcher/list/other/OtherInfo.kt rename to app/src/main/java/de/jrpie/android/launcher/list/other/OtherInfo.kt index 036a401..a219461 100644 --- a/app/src/main/java/com/finnmglas/launcher/list/other/OtherInfo.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/other/OtherInfo.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.list.other +package de.jrpie.android.launcher.list.other /** * Stores information used in [OtherRecyclerAdapter] rows. diff --git a/app/src/main/java/com/finnmglas/launcher/list/other/OtherRecyclerAdapter.kt b/app/src/main/java/de/jrpie/android/launcher/list/other/OtherRecyclerAdapter.kt similarity index 94% rename from app/src/main/java/com/finnmglas/launcher/list/other/OtherRecyclerAdapter.kt rename to app/src/main/java/de/jrpie/android/launcher/list/other/OtherRecyclerAdapter.kt index 4a7c147..a7fddfd 100644 --- a/app/src/main/java/com/finnmglas/launcher/list/other/OtherRecyclerAdapter.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/other/OtherRecyclerAdapter.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.list.other +package de.jrpie.android.launcher.list.other import android.app.Activity import android.content.Intent @@ -8,10 +8,10 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.finnmglas.launcher.R -import com.finnmglas.launcher.REQUEST_CHOOSE_APP -import com.finnmglas.launcher.libraries.* -import com.finnmglas.launcher.list.forApp +import de.jrpie.android.launcher.R +import de.jrpie.android.launcher.REQUEST_CHOOSE_APP +import de.jrpie.android.launcher.libraries.* +import de.jrpie.android.launcher.list.forApp /** * The [OtherRecyclerAdapter] will only be displayed in the ListActivity, diff --git a/app/src/main/java/com/finnmglas/launcher/settings/SettingsActivity.kt b/app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt similarity index 92% rename from app/src/main/java/com/finnmglas/launcher/settings/SettingsActivity.kt rename to app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt index 2b8ee70..7f759df 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/SettingsActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.settings +package de.jrpie.android.launcher.settings import android.content.Context import android.content.Intent @@ -6,15 +6,15 @@ import android.os.Bundle import android.provider.Settings import androidx.appcompat.app.AppCompatActivity import androidx.viewpager.widget.ViewPager -import com.finnmglas.launcher.* +import de.jrpie.android.launcher.* import com.google.android.material.tabs.TabLayout import kotlinx.android.synthetic.main.settings.* import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -import com.finnmglas.launcher.settings.actions.SettingsFragmentActions -import com.finnmglas.launcher.settings.launcher.SettingsFragmentLauncher -import com.finnmglas.launcher.settings.meta.SettingsFragmentMeta +import de.jrpie.android.launcher.settings.actions.SettingsFragmentActions +import de.jrpie.android.launcher.settings.launcher.SettingsFragmentLauncher +import de.jrpie.android.launcher.settings.meta.SettingsFragmentMeta var intendedSettingsPause = false // know when to close diff --git a/app/src/main/java/com/finnmglas/launcher/settings/actions/ActionInfo.kt b/app/src/main/java/de/jrpie/android/launcher/settings/actions/ActionInfo.kt similarity index 89% rename from app/src/main/java/com/finnmglas/launcher/settings/actions/ActionInfo.kt rename to app/src/main/java/de/jrpie/android/launcher/settings/actions/ActionInfo.kt index 78d1902..1bc8474 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/actions/ActionInfo.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/actions/ActionInfo.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.settings.actions +package de.jrpie.android.launcher.settings.actions /** * Stores information used in [ActionsRecyclerAdapter] rows. diff --git a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt similarity index 91% rename from app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt rename to app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt index 6d0de32..6ce2897 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.settings.actions +package de.jrpie.android.launcher.settings.actions import android.content.ActivityNotFoundException import android.content.Intent @@ -9,9 +9,9 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import androidx.fragment.app.Fragment -import com.finnmglas.launcher.* -import com.finnmglas.launcher.list.ListActivity -import com.finnmglas.launcher.settings.intendedSettingsPause +import de.jrpie.android.launcher.* +import de.jrpie.android.launcher.list.ListActivity +import de.jrpie.android.launcher.settings.intendedSettingsPause import kotlinx.android.synthetic.main.settings_actions.* diff --git a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt similarity index 96% rename from app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt rename to app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt index 01c42f9..c75e0d1 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.settings.actions +package de.jrpie.android.launcher.settings.actions import android.os.Bundle import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager -import com.finnmglas.launcher.* -import com.finnmglas.launcher.list.ListActivity +import de.jrpie.android.launcher.* +import de.jrpie.android.launcher.list.ListActivity import kotlinx.android.synthetic.main.settings_actions_recycler.* import android.app.Activity import android.content.Intent @@ -15,8 +15,8 @@ import android.widget.Button import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.finnmglas.launcher.libraries.FontAwesome -import com.finnmglas.launcher.settings.intendedSettingsPause +import de.jrpie.android.launcher.libraries.FontAwesome +import de.jrpie.android.launcher.settings.intendedSettingsPause import java.lang.Exception /** diff --git a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt similarity index 98% rename from app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt rename to app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt index 78a168d..200ee28 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.settings.launcher +package de.jrpie.android.launcher.settings.launcher import android.Manifest import android.app.Activity @@ -20,8 +20,8 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.palette.graphics.Palette -import com.finnmglas.launcher.* -import com.finnmglas.launcher.settings.intendedSettingsPause +import de.jrpie.android.launcher.* +import de.jrpie.android.launcher.settings.intendedSettingsPause import kotlinx.android.synthetic.main.settings_launcher.* diff --git a/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt b/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt similarity index 76% rename from app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt rename to app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt index 9d61773..fef959a 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.settings.meta +package de.jrpie.android.launcher.settings.meta import android.app.AlertDialog import android.content.ActivityNotFoundException @@ -12,9 +12,9 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.finnmglas.launcher.* -import com.finnmglas.launcher.tutorial.TutorialActivity -import com.finnmglas.launcher.settings.intendedSettingsPause +import de.jrpie.android.launcher.* +import de.jrpie.android.launcher.tutorial.TutorialActivity +import de.jrpie.android.launcher.settings.intendedSettingsPause import kotlinx.android.synthetic.main.settings_meta.* /** @@ -66,11 +66,7 @@ class SettingsFragmentMeta : Fragment(), UIObject { setButtonColor(settings_meta_button_reset_settings, vibrantColor) setButtonColor(settings_meta_button_report_bug, vibrantColor) setButtonColor(settings_meta_button_contact, vibrantColor) - setButtonColor(settings_meta_button_discord, vibrantColor) - - settings_meta_icon_github.setTextColor(vibrantColor) - settings_meta_icon_store.setTextColor(vibrantColor) - settings_meta_icon_donate.setTextColor(vibrantColor) + setButtonColor(settings_meta_button_fork_contact, vibrantColor) } override fun setOnClicks() { @@ -127,26 +123,6 @@ class SettingsFragmentMeta : Fragment(), UIObject { .show() } - // Icon onClicks - settings_meta_icon_github.setOnClickListener { - intendedSettingsPause = true - openNewTabWindow( - getString(R.string.settings_meta_link_github), - this.context!! - ) - } - // rate app / open store - settings_meta_icon_store.setOnClickListener { - try { - val rateIntent = rateIntentForUrl("market://details") - intendedSettingsPause = true - startActivity(rateIntent) - } catch (e: ActivityNotFoundException) { - val rateIntent = rateIntentForUrl("https://play.google.com/store/apps/details") - intendedSettingsPause = true - startActivity(rateIntent) - } - } // report a bug settings_meta_button_report_bug.setOnClickListener { @@ -157,15 +133,6 @@ class SettingsFragmentMeta : Fragment(), UIObject { ) } - // invite link to the discord server - settings_meta_button_discord.setOnClickListener { - intendedSettingsPause = true - openNewTabWindow( - getString(R.string.settings_meta_discord_url), - context!! - ) - } - // contact developer settings_meta_button_contact.setOnClickListener { intendedSettingsPause = true @@ -175,13 +142,14 @@ class SettingsFragmentMeta : Fragment(), UIObject { ) } - // donate - settings_meta_icon_donate.setOnClickListener { + // contact fork developer + settings_meta_button_fork_contact.setOnClickListener { intendedSettingsPause = true openNewTabWindow( - getString(R.string.settings_meta_donate_url), + getString(R.string.settings_meta_fork_contact_url), context!! ) } + } } \ No newline at end of file diff --git a/app/src/main/java/com/finnmglas/launcher/tutorial/TutorialActivity.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/TutorialActivity.kt similarity index 96% rename from app/src/main/java/com/finnmglas/launcher/tutorial/TutorialActivity.kt rename to app/src/main/java/de/jrpie/android/launcher/tutorial/TutorialActivity.kt index c20a721..4e70720 100644 --- a/app/src/main/java/com/finnmglas/launcher/tutorial/TutorialActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/TutorialActivity.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.tutorial +package de.jrpie.android.launcher.tutorial import android.content.Context import android.content.Intent @@ -9,8 +9,8 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter import androidx.viewpager.widget.ViewPager -import com.finnmglas.launcher.* -import com.finnmglas.launcher.tutorial.tabs.* +import de.jrpie.android.launcher.* +import de.jrpie.android.launcher.tutorial.tabs.* import com.google.android.material.tabs.TabLayout import kotlinx.android.synthetic.main.tutorial.* diff --git a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentConcept.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt similarity index 91% rename from app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentConcept.kt rename to app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt index 33c6952..881bd30 100644 --- a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentConcept.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt @@ -1,11 +1,11 @@ -package com.finnmglas.launcher.tutorial.tabs +package de.jrpie.android.launcher.tutorial.tabs import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.finnmglas.launcher.* +import de.jrpie.android.launcher.* import kotlinx.android.synthetic.main.tutorial_concept.* /** diff --git a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentFinish.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt similarity index 91% rename from app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentFinish.kt rename to app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt index 74485b9..64553fc 100644 --- a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentFinish.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt @@ -1,12 +1,12 @@ -package com.finnmglas.launcher.tutorial.tabs +package de.jrpie.android.launcher.tutorial.tabs import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.finnmglas.launcher.* -import com.finnmglas.launcher.BuildConfig.VERSION_NAME +import de.jrpie.android.launcher.* +import de.jrpie.android.launcher.BuildConfig.VERSION_NAME import kotlinx.android.synthetic.main.tutorial_finish.* /** diff --git a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentSetup.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentSetup.kt similarity index 90% rename from app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentSetup.kt rename to app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentSetup.kt index 4cf8b44..ebae407 100644 --- a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentSetup.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentSetup.kt @@ -1,11 +1,11 @@ -package com.finnmglas.launcher.tutorial.tabs +package de.jrpie.android.launcher.tutorial.tabs import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.finnmglas.launcher.* +import de.jrpie.android.launcher.* import kotlinx.android.synthetic.main.tutorial_setup.* /** diff --git a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentStart.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt similarity index 93% rename from app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentStart.kt rename to app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt index d8945eb..35810df 100644 --- a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentStart.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt @@ -1,11 +1,11 @@ -package com.finnmglas.launcher.tutorial.tabs +package de.jrpie.android.launcher.tutorial.tabs import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.finnmglas.launcher.* +import de.jrpie.android.launcher.* import kotlinx.android.synthetic.main.tutorial_start.* /** diff --git a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentUsage.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentUsage.kt similarity index 91% rename from app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentUsage.kt rename to app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentUsage.kt index 99dc6ba..4a3f0f7 100644 --- a/app/src/main/java/com/finnmglas/launcher/tutorial/tabs/TutorialFragmentUsage.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentUsage.kt @@ -1,11 +1,11 @@ -package com.finnmglas.launcher.tutorial.tabs +package de.jrpie.android.launcher.tutorial.tabs import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.finnmglas.launcher.* +import de.jrpie.android.launcher.* import kotlinx.android.synthetic.main.tutorial_usage.* /** diff --git a/app/src/main/res/layout/home.xml b/app/src/main/res/layout/home.xml index 8a9d41b..0da6484 100644 --- a/app/src/main/res/layout/home.xml +++ b/app/src/main/res/layout/home.xml @@ -44,19 +44,4 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/list.xml b/app/src/main/res/layout/list.xml index cf293a4..fc059df 100644 --- a/app/src/main/res/layout/list.xml +++ b/app/src/main/res/layout/list.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - - - - - - - - - -