From 5b044c376612b393f5cf7ff8420e5c30df9fa795 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 13:43:07 +0000 Subject: [PATCH 01/18] Bump appcompat from 1.4.1 to 1.5.1 Bumps appcompat from 1.4.1 to 1.5.1. --- updated-dependencies: - dependency-name: androidx.appcompat:appcompat dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 755c4fa..61c3070 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,7 +64,7 @@ testOptions { dependencies { - implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'com.google.android.material:material:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' testImplementation 'junit:junit:4.+' From 7496e746671da0c3779e6c1d9a16330d73a72dc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 13:43:12 +0000 Subject: [PATCH 02/18] Bump opencsv from 5.6 to 5.7.0 Bumps opencsv from 5.6 to 5.7.0. --- updated-dependencies: - dependency-name: com.opencsv:opencsv dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 755c4fa..86b544f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,5 +78,5 @@ dependencies { implementation 'com.savvi.datepicker:rangepicker:1.3.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'com.wdullaer:materialdatetimepicker:4.2.3' - implementation 'com.opencsv:opencsv:5.6' + implementation 'com.opencsv:opencsv:5.7.0' } From a9e8ebee49332222ffb233880b53fbf7fd432ac3 Mon Sep 17 00:00:00 2001 From: CrazyMarvin Date: Thu, 8 Sep 2022 21:23:14 +0200 Subject: [PATCH 03/18] 8.0 --> 9.0 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 531996e..0faa072 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,8 +31,8 @@ android { applicationId "rocks.poopjournal.vacationdays" minSdkVersion 21 targetSdkVersion 31 - versionCode 8 - versionName "8.0" + versionCode 9 + versionName "9.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From 7bd4b44eb293d3d68705a072270304b3760085ae Mon Sep 17 00:00:00 2001 From: Marvin Date: Thu, 8 Sep 2022 21:29:06 +0200 Subject: [PATCH 04/18] Target Android 13 --- app/build.gradle | 4 ++-- app/release/output-metadata.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0faa072..22e9569 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,14 +23,14 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'crea } android { - compileSdkVersion 31 + compileSdkVersion 33 lintOptions { checkReleaseBuilds false } defaultConfig { applicationId "rocks.poopjournal.vacationdays" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 9 versionName "9.0" diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 2877fe2..7eceb16 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 8, - "versionName": "8.0", + "versionCode": 9, + "versionName": "9.0", "outputFile": "app-release.apk" } ], From ccaec5c3ce5fd60901184b4ddc6ed9664800fec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Thu, 8 Sep 2022 15:05:09 +0000 Subject: [PATCH 05/18] Translated using Weblate (Turkish) Currently translated at 100.0% (40 of 40 strings) Translation: Vacation Days/Vacation Days Translate-URL: https://hosted.weblate.org/projects/vacation-days/vacation-days/tr/ --- app/src/main/res/values-tr/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ec1338a..3a99428 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -39,4 +39,6 @@ Sistemi Takip Et Açık Koyu + Tatil Sayısı + Tatil Sayısını Girin \ No newline at end of file From 44c5fc14276c6f3ca514fb132d8ec6e64b2eaf06 Mon Sep 17 00:00:00 2001 From: "J. Lavoie" Date: Wed, 14 Sep 2022 10:16:54 +0000 Subject: [PATCH 06/18] Translated using Weblate (German) Currently translated at 100.0% (40 of 40 strings) Translation: Vacation Days/Vacation Days Translate-URL: https://hosted.weblate.org/projects/vacation-days/vacation-days/de/ --- app/src/main/res/values-de/strings.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index eee39c9..4752fc6 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -15,7 +15,7 @@ Allgemein Erscheinungsbild Daten - Backup + Datensicherung Rücksicherung Urlaubstag(e) benennen Speichern @@ -28,7 +28,7 @@ Apache Lizenz 2.0 CircleImageView Ein Problem melden - Open Source Lizenzen + Quelloffene Lizenzen Dem System folgen GNU General Public Lizenz CE Code Acquaria @@ -39,4 +39,6 @@ Übersetzen Quelltext anschauen Hell + Anzahl der Urlaube + Anzahl der Urlaube eingeben \ No newline at end of file From fd6d96907555186413ca6aeecefc71f4571c615a Mon Sep 17 00:00:00 2001 From: "J. Lavoie" Date: Wed, 14 Sep 2022 10:18:39 +0000 Subject: [PATCH 07/18] Translated using Weblate (French) Currently translated at 100.0% (40 of 40 strings) Translation: Vacation Days/Vacation Days Translate-URL: https://hosted.weblate.org/projects/vacation-days/vacation-days/fr/ --- app/src/main/res/values-fr/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a87edb4..d8bc1d9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -18,7 +18,7 @@ Traduire Signaler un problème Voir la source - Licences open-source + Licences à code source ouvert Icônes Feather Licence MIT Icônes Material Design @@ -39,4 +39,6 @@ Code Acquaria Android Jetpack Ajouter un titre de jour ferié + Nombre de vacances + Entrez le nombre de vacances \ No newline at end of file From 6fd32e3735b7a0a45cfcca3eea9637677841d539 Mon Sep 17 00:00:00 2001 From: "J. Lavoie" Date: Wed, 14 Sep 2022 10:17:55 +0000 Subject: [PATCH 08/18] Translated using Weblate (Italian) Currently translated at 100.0% (40 of 40 strings) Translation: Vacation Days/Vacation Days Translate-URL: https://hosted.weblate.org/projects/vacation-days/vacation-days/it/ --- app/src/main/res/values-it/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c4def51..dab8ae0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -39,4 +39,6 @@ Salva Chiaro Scuro + Numero di vacanze + Inserisci il numero di vacanze \ No newline at end of file From 38bfe0ac464619ceceb68b6a0a6cfcca09b3763c Mon Sep 17 00:00:00 2001 From: bruh Date: Fri, 16 Sep 2022 13:31:44 +0700 Subject: [PATCH 09/18] Implement backup and restore without storage permission --- .../vacationdays/SettingsActivity.java | 117 ++++++++++++++++-- 1 file changed, 106 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/rocks/poopjournal/vacationdays/SettingsActivity.java b/app/src/main/java/rocks/poopjournal/vacationdays/SettingsActivity.java index 01c2580..43a3953 100644 --- a/app/src/main/java/rocks/poopjournal/vacationdays/SettingsActivity.java +++ b/app/src/main/java/rocks/poopjournal/vacationdays/SettingsActivity.java @@ -18,6 +18,8 @@ import android.widget.TextView; import android.widget.Toast; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatDelegate; @@ -25,11 +27,17 @@ import androidx.core.content.ContextCompat; import com.opencsv.CSVReader; +import com.opencsv.exceptions.CsvValidationException; +import java.io.BufferedWriter; import java.io.File; import java.io.FileReader; import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.util.ArrayList; +import java.util.List; import static android.Manifest.permission.READ_EXTERNAL_STORAGE; import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; @@ -41,6 +49,89 @@ public class SettingsActivity extends AppCompatActivity { private static final int STORAGE_REQUEST_CODE_EXPORT = 1; private static final int STORAGE_REQUEST_CODE_IMPORT = 2; private String[] storagepermission; + private final ActivityResultLauncher importCSV = registerForActivityResult(new ActivityResultContracts.GetContent(), result -> { + if (result != null) { + try (CSVReader csvReader = new CSVReader(new InputStreamReader(getContentResolver().openInputStream(result)))) { + // List restoreData = new ArrayList<>(); + + int k = Helper.data.size(); + int counter; + if (k == 0) { + counter = 1; + } else { + counter = Helper.data.size(); + } + for (int i = 0; i < counter; i++) { + Log.d("bakwaasinloop", "i am in" + counter); + String[] nextline; + while ((nextline = csvReader.readNext()) != null) { + String id = nextline[0]; + String title = nextline[1]; + String monthyear = nextline[2]; + String dates = nextline[3]; + String newdates = dates.replaceAll("geodholaz", ","); + int noOfHolidays = Integer.parseInt(nextline[4]); + db.insert_data(id, title, monthyear, newdates, noOfHolidays); + db.show_data(); + + Helper.holidayTitle = ""; + k++; + } + } + Helper.whichTabSelected = 0; + Toast.makeText(this, Helper.whichTabSelected + "Restored...." + Helper.data.size(), Toast.LENGTH_SHORT).show(); + Intent in = new Intent(SettingsActivity.this, MainActivity.class); + startActivity(in); + finish(); + } catch (IOException | CsvValidationException e) { + e.printStackTrace(); + } + } + }); + private final ActivityResultLauncher exportCSV = registerForActivityResult(new ActivityResultContracts.CreateDocument("text/plain"), result -> { + if (result != null) { + try (BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(getContentResolver().openOutputStream(result)))) { + for (int i = 0; i < Helper.data.size(); i++) { + bw.append(Helper.data.get(i)[0]); + bw.append(","); + bw.append(Helper.data.get(i)[1]); + bw.append(","); + bw.append(Helper.data.get(i)[2]); + bw.append(","); + String newdate = Helper.data.get(i)[3]; + String new1 = newdate.replaceAll(",", "geodholaz"); + Log.d("formatingdate", "" + new1); + bw.append(new1); + bw.append(","); + String noOfHolidays = Helper.data.get(i)[4]; + bw.append(noOfHolidays); + bw.append(","); + bw.append("\n"); + //Toast.makeText(this, "Backup Exported "+FileandPathname, Toast.LENGTH_LONG ).show(); + } + Toast.makeText(this, "Backup Exported", Toast.LENGTH_LONG ).show(); + /*final Dialog d = new Dialog(this); + d.requestWindowFeature(Window.FEATURE_NO_TITLE); + d.setContentView(R.layout.backup_dialogbox); + Button btnok = d.findViewById(R.id.btnok); + TextView path = d.findViewById(R.id.path); + path.setText("Backup Exported"); + WindowManager.LayoutParams lp = d.getWindow().getAttributes(); + lp.dimAmount = 0.9f; + d.getWindow().setAttributes(lp); + d.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); + btnok.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + d.dismiss(); + } + }); + d.show();*/ + } catch (IOException e) { + + } + } + }); @Override @@ -51,7 +142,7 @@ protected void onCreate(Bundle savedInstanceState) { storagepermission = new String[]{WRITE_EXTERNAL_STORAGE}; modetitle = findViewById(R.id.modetitle); noofvacations = findViewById(R.id.noOfvacations); - noofvacations.setText(""+Helper.totalHolidays); + noofvacations.setText("" + Helper.totalHolidays); switch (rocks.poopjournal.vacationdays.Helper.isnightmodeon) { case "followsys": modetitle.setText("Follow System"); @@ -202,12 +293,13 @@ public void back(View view) { Intent i = new Intent(this, MainActivity.class); startActivity(i); } + public void setnoofvacations(View view) { final Dialog d = new Dialog(this); d.requestWindowFeature(Window.FEATURE_NO_TITLE); d.setContentView(R.layout.noofvacationsdialogbox); Button btnsave = d.findViewById(R.id.savenoofvacations); - EditText noofvacations=d.findViewById(R.id.enterednoofvacations); + EditText noofvacations = d.findViewById(R.id.enterednoofvacations); WindowManager.LayoutParams lp = d.getWindow().getAttributes(); lp.dimAmount = 0.9f; d.getWindow().setAttributes(lp); @@ -215,14 +307,14 @@ public void setnoofvacations(View view) { btnsave.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - int setnoofvacations= Integer.parseInt(noofvacations.getText().toString()); + int setnoofvacations = Integer.parseInt(noofvacations.getText().toString()); db.setnoofholidays(setnoofvacations); - noofvacations.setText(""+Helper.totalHolidays); + noofvacations.setText("" + Helper.totalHolidays); d.dismiss(); - Intent intennt = new Intent(SettingsActivity.this,SettingsActivity.class); - startActivity(intennt); - overridePendingTransition(0, 0); - finish(); + Intent intennt = new Intent(SettingsActivity.this, SettingsActivity.class); + startActivity(intennt); + overridePendingTransition(0, 0); + finish(); } }); d.show(); @@ -316,7 +408,8 @@ public void onRadioButtonClicked(View view) { public void backup(View view) { - Toast.makeText(this, "This functionality will be available in next version", Toast.LENGTH_SHORT).show(); + //Toast.makeText(this, "This functionality will be available in next version", Toast.LENGTH_SHORT).show(); + exportCSV.launch("holidays_" + System.currentTimeMillis()); // if(checkStoragePermission()){ // Log.d("IntakePerExport","hello"); @@ -329,9 +422,11 @@ public void backup(View view) { // requestStoragePermissionExport(); // } } -// + + // public void restore(View view) { - Toast.makeText(this, "This functionality will be available in next version", Toast.LENGTH_SHORT).show(); + //Toast.makeText(this, "This functionality will be available in next version", Toast.LENGTH_SHORT).show(); + importCSV.launch("text/plain"); // String text="Bismillah di barkat"; //// savefile(file_name,text); From 0c9530725afb886f762943a4fd92d5293b8309b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 08:49:51 +0000 Subject: [PATCH 10/18] Bump gradle from 7.2.2 to 7.3.0 Bumps gradle from 7.2.2 to 7.3.0. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f5287bf..cd378f5 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jacoco:org.jacoco.core:$jacocoVersion" // NOTE: Do not place your application dependencies here; they belong From 5e5d6a0be97a53e965d3ef297f551470e829aa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Mon, 19 Sep 2022 19:08:53 +0000 Subject: [PATCH 11/18] Translated using Weblate (Turkish) Currently translated at 100.0% (12 of 12 strings) Translation: Vacation Days/Metadata Translate-URL: https://hosted.weblate.org/projects/vacation-days/metadata/tr/ --- fastlane/metadata/android/tr/changelogs/8.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 fastlane/metadata/android/tr/changelogs/8.txt diff --git a/fastlane/metadata/android/tr/changelogs/8.txt b/fastlane/metadata/android/tr/changelogs/8.txt new file mode 100644 index 0000000..9bcbf27 --- /dev/null +++ b/fastlane/metadata/android/tr/changelogs/8.txt @@ -0,0 +1 @@ +Uygulama artık tatil günlerinin sayısını gösteriyor. Daha fazla geliştirme yolda. 🚀 From 9c30f1953cff567477cc457b051a4e2ee49e1137 Mon Sep 17 00:00:00 2001 From: Marcus Radisch Date: Fri, 23 Sep 2022 09:05:35 +0200 Subject: [PATCH 12/18] Version name fixed remove the import --- app/build.gradle | 3 +- .../rocks/poopjournal/vacationdays/About.java | 45 ++++++++++++------- app/src/main/res/layout/activity_about.xml | 9 +--- app/src/main/res/values/strings.xml | 1 + 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 75148ce..7d2c3d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,8 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'crea } android { - compileSdkVersion 31 + compileSdkVersion 32 + defaultConfig { applicationId "rocks.poopjournal.vacationdays" minSdkVersion 21 diff --git a/app/src/main/java/rocks/poopjournal/vacationdays/About.java b/app/src/main/java/rocks/poopjournal/vacationdays/About.java index 5e10bbf..a06fd69 100644 --- a/app/src/main/java/rocks/poopjournal/vacationdays/About.java +++ b/app/src/main/java/rocks/poopjournal/vacationdays/About.java @@ -1,5 +1,6 @@ package rocks.poopjournal.vacationdays; +import android.annotation.SuppressLint; import android.content.ActivityNotFoundException; import android.content.Intent; import android.net.Uri; @@ -11,20 +12,27 @@ import androidx.appcompat.app.AppCompatActivity; -import com.github.sundeepk.compactcalendarview.BuildConfig; +//import com.github.sundeepk.compactcalendarview.BuildConfig; public class About extends AppCompatActivity { - TextView version; + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); - version=findViewById(R.id.versiontext); - version.setText(BuildConfig.VERSION_NAME+" "+this.getString(R.string.apache) ); -} + TextView appVersion = findViewById(R.id.version); + //version.setText(BuildConfig.VERSION_NAME+" "+this.getString(R.string.apache) ); + + //@SuppressLint({"StringFormatInvalid", "LocalSuppress"}) String version = + @SuppressLint({"StringFormatInvalid", "LocalSuppress"}) String version = + String.format(getResources().getString(R.string.version), + BuildConfig.VERSION_NAME); + appVersion.setText(version); + } public void contact_codeaquaria(View view) { - switch(view.getId()){ + switch (view.getId()) { case R.id.btnmail_codeaquaria: String mailto = "mailto:codeaquaria20@gmail.com"; Intent emailIntent = new Intent(Intent.ACTION_SENDTO); @@ -54,7 +62,7 @@ public void contact_codeaquaria(View view) { } public void contact_marvin(View view) { - switch(view.getId()){ + switch (view.getId()) { case R.id.btnmail_crazymarvin: String mailto = "mailto:marvin@poopjournal.rocks"; Intent emailIntent = new Intent(Intent.ACTION_SENDTO); @@ -145,19 +153,22 @@ public void Kotlin(View view) { Intent i = new Intent(Intent.ACTION_VIEW, u); startActivity(i); } + public void Java(View view) { Uri u = Uri.parse("http://openjdk.java.net/legal/gplv2+ce.html"); Intent i = new Intent(Intent.ACTION_VIEW, u); startActivity(i); } - public void nobobutton(View view) { - Uri u = Uri.parse("https://github.com/alex31n/NoboButton/blob/master/LICENSE"); - Intent i = new Intent(Intent.ACTION_VIEW, u); - startActivity(i); - } - public void cImgButton(View view) { - Uri u = Uri.parse("https://github.com/hdodenhof/CircleImageView/blob/master/LICENSE.txt"); - Intent i = new Intent(Intent.ACTION_VIEW, u); - startActivity(i); - } + + public void nobobutton(View view) { + Uri u = Uri.parse("https://github.com/alex31n/NoboButton/blob/master/LICENSE"); + Intent i = new Intent(Intent.ACTION_VIEW, u); + startActivity(i); + } + + public void cImgButton(View view) { + Uri u = Uri.parse("https://github.com/hdodenhof/CircleImageView/blob/master/LICENSE.txt"); + Intent i = new Intent(Intent.ACTION_VIEW, u); + startActivity(i); + } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 28ee3b7..26a849a 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -99,18 +99,13 @@ android:orientation="horizontal" android:onClick="apacheee"> - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 371e5a6..4cd0adf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,6 +14,7 @@ Delete any prior backup files first Crazy Marvin Developer + %1$s Code Acquaria Contribute Translate From e5369979aaec90847500268b1f0ee5d6f1e051ba Mon Sep 17 00:00:00 2001 From: CrazyMarvin Date: Fri, 23 Sep 2022 15:21:55 +0200 Subject: [PATCH 13/18] Add Changelog For Vacation Days 9.0 --- fastlane/metadata/android/en-US/changelogs/9.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/9.txt diff --git a/fastlane/metadata/android/en-US/changelogs/9.txt b/fastlane/metadata/android/en-US/changelogs/9.txt new file mode 100644 index 0000000..2d9e1de --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/9.txt @@ -0,0 +1,6 @@ +- ⚙️ Fix backup (#94) +- 🎨 Support Themed Icon which was introduced for Android 13+ (#83) +- 🐛 Fix version name shown in the About screen (#97) +- 👍 Update dependencies and translations + +Thank you so much to @unbiaseduser, @amarradi and all translators! 😘 From caaeecd0e082bf4fff6b59750be6b2ba65ff969f Mon Sep 17 00:00:00 2001 From: bruh Date: Sat, 24 Sep 2022 15:50:01 +0700 Subject: [PATCH 14/18] fix date display for vacations with 1 day --- .../vacationdays/SubItemAdapter.java | 16 +++----- app/src/main/res/layout/layout_sub_item.xml | 39 +++---------------- app/src/main/res/values/strings.xml | 1 + 3 files changed, 12 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/rocks/poopjournal/vacationdays/SubItemAdapter.java b/app/src/main/java/rocks/poopjournal/vacationdays/SubItemAdapter.java index 547f604..1dc6b93 100644 --- a/app/src/main/java/rocks/poopjournal/vacationdays/SubItemAdapter.java +++ b/app/src/main/java/rocks/poopjournal/vacationdays/SubItemAdapter.java @@ -50,14 +50,10 @@ public void onBindViewHolder(@NonNull SubItemViewHolder subItemViewHolder, int i db.updateHabitsIdsForDeletion(subItem.getSubItemTitle(),subItem.getMonthyear(),updatedid); db.show_data(); if(subItem.getStart().equals(subItem.getEnd())){ - subItemViewHolder.startdate.setVisibility(View.INVISIBLE); - subItemViewHolder.to.setText(subItem.getStart()); - subItemViewHolder.enddate.setVisibility(View.INVISIBLE); + subItemViewHolder.dateRange.setText(subItem.getStart()); } else{ - subItemViewHolder.startdate.setText(subItem.getStart()); - subItemViewHolder.to.setBackgroundResource(R.drawable.arrow_down); - subItemViewHolder.enddate.setText(subItem.getEnd()); + subItemViewHolder.dateRange.setText(con.getString(R.string.date_range, subItem.getStart(), subItem.getEnd())); } subItemViewHolder.img.setOnClickListener(new View.OnClickListener() { @@ -98,16 +94,14 @@ public int getItemCount() { return subItemList.size(); } - class SubItemViewHolder extends RecyclerView.ViewHolder { - TextView tvSubItemTitle, startdate, to, enddate; + static class SubItemViewHolder extends RecyclerView.ViewHolder { + TextView tvSubItemTitle, dateRange; ImageView img; SubItemViewHolder(View itemView) { super(itemView); tvSubItemTitle = itemView.findViewById(R.id.tv_sub_item_title); - startdate = itemView.findViewById(R.id.startdate); - to = itemView.findViewById(R.id.to); - enddate = itemView.findViewById(R.id.enddate); + dateRange = itemView.findViewById(R.id.date_range); img=itemView.findViewById(R.id.btndel); } } diff --git a/app/src/main/res/layout/layout_sub_item.xml b/app/src/main/res/layout/layout_sub_item.xml index fc691f2..912f888 100644 --- a/app/src/main/res/layout/layout_sub_item.xml +++ b/app/src/main/res/layout/layout_sub_item.xml @@ -13,40 +13,13 @@ android:layout_marginRight="5dp" > - - - - - - - - + android:textColor="@color/subitem_text" + android:gravity="center" + android:layout_gravity="center"/> Add Holiday Title Save OK + %s\n↓\n%s Follow System Light Dark From 6c0e0380d1165e932b5aa2fd1ca2bcfe83fe3455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 23 Sep 2022 14:56:34 +0000 Subject: [PATCH 15/18] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (41 of 41 strings) Translation: Vacation Days/Vacation Days Translate-URL: https://hosted.weblate.org/projects/vacation-days/vacation-days/nb_NO/ --- app/src/main/res/values-nb-rNO/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index d9ef293..f5774d1 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -38,4 +38,6 @@ DateRangePicker Crazy Marvin Code Acquaria + Antall ferier + Skriv inn antall ferier \ No newline at end of file From d57efd2bc0bd2ee36d84b2503c363d25083ebae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 23 Sep 2022 14:56:18 +0000 Subject: [PATCH 16/18] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (13 of 13 strings) Translation: Vacation Days/Metadata Translate-URL: https://hosted.weblate.org/projects/vacation-days/metadata/nb_NO/ --- fastlane/metadata/android/nb-NO/changelogs/8.txt | 1 + fastlane/metadata/android/nb-NO/changelogs/9.txt | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 fastlane/metadata/android/nb-NO/changelogs/8.txt create mode 100644 fastlane/metadata/android/nb-NO/changelogs/9.txt diff --git a/fastlane/metadata/android/nb-NO/changelogs/8.txt b/fastlane/metadata/android/nb-NO/changelogs/8.txt new file mode 100644 index 0000000..1cdd9dd --- /dev/null +++ b/fastlane/metadata/android/nb-NO/changelogs/8.txt @@ -0,0 +1 @@ +Programmet viser nå antall feriedager. Flere forbedringer i vente. 🚀 diff --git a/fastlane/metadata/android/nb-NO/changelogs/9.txt b/fastlane/metadata/android/nb-NO/changelogs/9.txt new file mode 100644 index 0000000..ddca534 --- /dev/null +++ b/fastlane/metadata/android/nb-NO/changelogs/9.txt @@ -0,0 +1,6 @@ +- ⚙️ Fikset sikkerhetskopiering (#94) +- 🎨 Støtte for draktsøm i ikon, introdusert i Android 13+ (#83) +- 🐛 Fikset navn vist i «Om» (#97) +- 👍 Oppdaterte avhengigheter og oversettelser + +Mange takk til @unbiaseduser, @amarradi og alle oversettere! 😘 From 69e28d24c48d5560c81f4d18856b88de47608d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Fri, 23 Sep 2022 15:04:39 +0000 Subject: [PATCH 17/18] Translated using Weblate (Turkish) Currently translated at 100.0% (13 of 13 strings) Translation: Vacation Days/Metadata Translate-URL: https://hosted.weblate.org/projects/vacation-days/metadata/tr/ --- fastlane/metadata/android/tr/changelogs/9.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 fastlane/metadata/android/tr/changelogs/9.txt diff --git a/fastlane/metadata/android/tr/changelogs/9.txt b/fastlane/metadata/android/tr/changelogs/9.txt new file mode 100644 index 0000000..7df54b5 --- /dev/null +++ b/fastlane/metadata/android/tr/changelogs/9.txt @@ -0,0 +1,6 @@ +- ⚙️ Yedekleme düzeltildi (#94) +- 🎨 Android 13 ve sonrası için sunulan Temalı Simge Desteği (#83) +- 🐛 Hakkında ekranında gösterilen sürüm adı düzeltildi (#97) +- 👍 Bağımlılıklar ve çeviriler güncellendi + +@unbiaseduser, @amarradi ve tüm çevirmenlere teşekkürler! 😘 From 91a84334375e41782d36c76c93307afb4bc9a707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Mon, 26 Sep 2022 18:56:13 +0000 Subject: [PATCH 18/18] Translated using Weblate (Turkish) Currently translated at 100.0% (42 of 42 strings) Translation: Vacation Days/Vacation Days Translate-URL: https://hosted.weblate.org/projects/vacation-days/vacation-days/tr/ --- app/src/main/res/values-tr/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 3a99428..0883495 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -41,4 +41,7 @@ Koyu Tatil Sayısı Tatil Sayısını Girin + %s +\n↓ +\n%s \ No newline at end of file