Skip to content

Commit

Permalink
1.5
Browse files Browse the repository at this point in the history
- Updated icon
- Some improvements
  • Loading branch information
Sav22999 committed Nov 10, 2023
1 parent 4af73e1 commit a010628
Show file tree
Hide file tree
Showing 41 changed files with 286 additions and 190 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified app/GPS/release/app-GPS-release.aab
Binary file not shown.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ plugins {

android {
compileSdkVersion 30
buildToolsVersion "30.0.2"

defaultConfig {
applicationId 'com.saverio.wordoftheday_en'
minSdkVersion 16
targetSdkVersion 30
versionCode 15
versionName '1.4.1'
targetSdk 33
versionCode 16
versionName '1.5'
multiDexEnabled true

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -38,6 +37,7 @@ android {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
}
}
compileOptions {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
android:supportsRtl="true"
android:theme="@style/Theme.WordOfTheDay"
android:usesCleartextTraffic="true">
<activity android:name=".Settings"></activity>
<activity android:name=".Settings" />
<!--SplashScreen-->
<activity
android:name=".SplashScreen"
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="true"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -29,8 +30,7 @@
<activity
android:name=".MainActivity"
android:configChanges="orientation|screenSize"
android:launchMode="singleTask">
</activity>
android:launchMode="singleTask" />

<receiver android:name=".NotificationReceiver" />

Expand Down
Binary file modified app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions app/src/main/java/com/saverio/wordoftheday_en/Settings.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ package com.saverio.wordoftheday_en

import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.provider.ContactsContract.CommonDataKinds.Im
import android.view.MotionEvent
import android.widget.ImageView
import android.widget.Switch
Expand Down Expand Up @@ -61,6 +64,19 @@ class Settings : AppCompatActivity() {
}
pushNotificationsSwitch.isChecked = getPushNotifications()

val saverioMorelliImage: ImageView = findViewById(R.id.imageDeveloper)
saverioMorelliImage.setOnClickListener {
val openURL = Intent(Intent.ACTION_VIEW)
openURL.data = Uri.parse("https://www.saveriomorelli.com/")
startActivity(openURL)
}
val saverioMorelliText: TextView = findViewById(R.id.textSaverioMorelli)
saverioMorelliImage.setOnClickListener {
val openURL = Intent(Intent.ACTION_VIEW)
openURL.data = Uri.parse("https://www.saveriomorelli.com/")
startActivity(openURL)
}

val releaseNumber: TextView = findViewById(R.id.settingsReleaseNumber)
releaseNumber.text = BuildConfig.VERSION_NAME + " (build#" + BuildConfig.VERSION_CODE + ")"

Expand Down
26 changes: 12 additions & 14 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group android:scaleX="3.6"
android:scaleY="3.6">
<path
android:fillColor="#FF000000"
android:pathData="M3,0h24c1.7,0 3,1.3 3,3v24c0,1.7 -1.3,3 -3,3H3c-1.7,0 -3,-1.3 -3,-3V3C0,1.3 1.3,0 3,0z"/>
<path
android:pathData="M3,0h24c1.7,0 3,1.3 3,3v24c0,1.7 -1.3,3 -3,3H3c-1.7,0 -3,-1.3 -3,-3V3C0,1.3 1.3,0 3,0z"
android:fillColor="#DDDDDD"/>
<path
android:pathData="M16,20.3h-0.6c0.2,-1 0.6,-3.2 1.3,-6.7l0.3,-1.8c-0.6,0.8 -1.4,1.8 -2.2,3.1s-2.1,3.1 -3.6,5.4H9.8c0.3,-0.6 0.6,-1.5 1,-2.6c0.7,-2.3 1,-4 1,-5.3c0,-1.5 -0.5,-2.2 -1.4,-2.2c-0.4,0 -0.8,0.1 -1.1,0.3c-0.3,0.2 -0.6,0.5 -0.8,0.8s-0.4,0.7 -0.5,1.1c-0.2,0.7 -0.4,1.5 -0.4,2.2c0,0.7 0.1,1.5 0.3,2.1c0.2,0.7 0.6,1.2 1.1,1.5l-0.3,0.3c-0.5,-0.4 -0.9,-1 -1.1,-1.7c-0.2,-0.7 -0.4,-1.4 -0.4,-2c0,-0.6 0,-1.1 0.1,-1.5s0.2,-0.8 0.4,-1.3c0.2,-0.4 0.4,-0.8 0.6,-1.1C8.7,10.5 9,10.2 9.4,10c0.4,-0.2 0.8,-0.3 1.3,-0.3s0.9,0.1 1.2,0.2c0.3,0.2 0.6,0.4 0.8,0.7c0.4,0.5 0.6,1.3 0.6,2.2c0,1.4 -0.5,3.4 -1.5,5.8c1.6,-2.7 2.9,-4.7 3.8,-5.9c0.8,-1.1 1.6,-1.9 2.3,-2.5l0.5,0.2L17,19c1.1,-0.7 1.9,-1.6 2.6,-2.6c0.7,-1 1.1,-2.1 1.3,-3.3c-0.5,-0.2 -0.9,-0.5 -1.2,-0.9s-0.5,-0.8 -0.5,-1.2c0,-0.4 0.1,-0.7 0.3,-0.9c0.2,-0.2 0.5,-0.4 0.8,-0.4c0.3,0 0.5,0.1 0.7,0.2c0.2,0.1 0.3,0.3 0.4,0.4c0.2,0.4 0.3,0.8 0.3,1.2s0,0.9 -0.1,1.3c0.4,0.2 0.7,0.3 1.1,0.4l-0.1,0.3c-0.6,-0.2 -1,-0.3 -1.1,-0.3c-0.3,1.5 -0.9,2.8 -1.8,4C18.7,18.5 17.5,19.5 16,20.3zM20,11.1c0.1,0.6 0.4,1.1 1,1.5c0.1,-0.4 0.1,-0.7 0.1,-0.9s0,-0.4 0,-0.5c0,-0.1 0,-0.2 -0.1,-0.3c-0.1,-0.3 -0.2,-0.4 -0.5,-0.4c-0.2,0 -0.3,0.1 -0.4,0.2C20,10.7 20,10.9 20,11.1L20,11.1z"
android:fillColor="#039BE5"/>
</group>
android:viewportWidth="30"
android:viewportHeight="30">
<group
android:scaleX="0.66741574"
android:scaleY="0.66741574"
android:translateX="5.0814605"
android:translateY="4.988764">
<path
android:fillColor="#039BE5"
android:fillType="nonZero"
android:pathData="M16.6,23.4L15.6,23.4C15.9,21.9 16.6,18.3 17.7,12.8L18.3,9.9C17.3,11.1 16.1,12.7 14.7,14.8C13.3,16.9 11.4,19.7 8.9,23.5L6.8,23.5C7.3,22.6 7.8,21.2 8.4,19.3C9.5,15.7 10.1,12.9 10.1,10.9C10.1,8.5 9.4,7.3 7.9,7.3C7.3,7.3 6.7,7.5 6.2,7.8C5.7,8.1 5.2,8.5 4.9,9C4.6,9.5 4.3,10.1 4.1,10.7C3.7,11.9 3.5,13 3.5,14.2C3.5,15.4 3.7,16.5 4,17.6C4.3,18.7 4.9,19.5 5.7,20L5.1,20.5C4.3,19.8 3.7,18.9 3.3,17.7C2.9,16.5 2.7,15.5 2.7,14.6C2.7,13.7 2.8,12.8 2.9,12.2C3,11.6 3.2,10.8 3.5,10.2C3.8,9.6 4.1,8.9 4.5,8.4C4.9,7.9 5.4,7.4 6,7C6.6,6.6 7.3,6.5 8,6.5C8.7,6.5 9.4,6.6 10,6.9C10.6,7.2 11,7.5 11.3,8C11.9,8.9 12.2,10 12.2,11.5C12.2,13.8 11.4,16.9 9.7,20.8C12.3,16.5 14.3,13.3 15.8,11.4C17.1,9.6 18.4,8.3 19.5,7.4L20.3,7.8L18.2,21.5C19.9,20.4 21.3,18.9 22.3,17.3C23.3,15.7 24.1,13.9 24.4,12C23.6,11.6 23,11.2 22.4,10.6C21.8,10 21.6,9.4 21.6,8.8C21.6,8.2 21.8,7.7 22.1,7.3C22.4,6.9 22.8,6.7 23.3,6.7C23.8,6.7 24.2,6.8 24.4,7C24.6,7.2 24.9,7.4 25.1,7.7C25.4,8.3 25.6,8.9 25.6,9.6C25.6,10.3 25.5,11 25.4,11.8C26,12.1 26.6,12.3 27.2,12.4L27,13C26,12.8 25.4,12.6 25.2,12.5C24.7,14.8 23.7,17 22.3,18.9C20.9,20.8 19,22.2 16.6,23.4ZM22.9,8.7C23,9.6 23.5,10.4 24.6,11.1C24.7,10.5 24.8,10 24.8,9.6L24.8,8.8C24.8,8.7 24.8,8.5 24.7,8.3C24.6,7.9 24.3,7.6 23.9,7.6C23.6,7.6 23.4,7.7 23.2,7.9C23,8.1 22.9,8.4 22.9,8.7Z" />
</group>
</vector>
29 changes: 28 additions & 1 deletion app/src/main/res/layout/activity_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,33 @@
android:layout_height="match_parent"
tools:context=".Settings">

<ImageView
android:id="@+id/imageDeveloper"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:background="@android:color/transparent"
android:tint="@android:color/transparent"
app:layout_constraintBottom_toTopOf="@+id/textSaverioMorelli"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@drawable/me_circle" />

<TextView
android:id="@+id/textSaverioMorelli"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="10dp"
android:text="Saverio Morelli"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintBottom_toTopOf="@+id/settingsReleaseNumber"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/settingsReleaseNumber"
android:layout_width="wrap_content"
Expand All @@ -28,7 +55,7 @@
android:id="@+id/settingsSeparator1"
android:layout_width="match_parent"
android:layout_height="20dp"
app:layout_constraintBottom_toTopOf="@+id/settingsReleaseNumber"
app:layout_constraintBottom_toTopOf="@+id/imageDeveloper"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settingsNotificationContainer" />
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file added app/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file added app/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary file not shown.
Binary file added app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#DDDDDD</color>
<color name="ic_launcher_background">#dddddd</color>
</resources>
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = "1.4.21"
ext.kotlin_version = '1.6.21'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed Jan 20 02:34:05 CET 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
Loading

0 comments on commit a010628

Please sign in to comment.