Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): Publish v1.0.0 #19

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog

## [Unreleased]

## [1.0.0] - 2024-08-07
- Initial stable release
- Update repository link
- Upgrade Gradle dependencies
- Keep obfuscated source files and lines for debugging

Expand Down Expand Up @@ -30,10 +34,10 @@
## [0.1.0-alpha.0] - 2021-04-05
- Internal test release

[unreleased]: https://github.com/lmu-informatics/tree-app-android/compare/0.1.0-beta.0...master
[0.1.0-beta.0]: https://github.com/lmu-informatics/tree-app-android/compare/0.1.0-alpha.3...0.1.0-beta.0
[0.1.0-alpha.3]: https://github.com/lmu-informatics/tree-app-android/compare/0.1.0-alpha.2...0.1.0-alpha.3
[0.1.0-alpha.2]: https://github.com/lmu-informatics/tree-app-android/compare/0.1.0-alpha.1...0.1.0-alpha.2
[0.1.0-alpha.1]: https://github.com/lmu-informatics/tree-app-android/compare/0.1.0-alpha.0...0.1.0-alpha.1
[0.1.0-alpha.0]: https://github.com/lmu-informatics/tree-app-android/compare/0.0.7...0.1.0-alpha.0
[0.0.7]: https://github.com/lmu-informatics/tree-app-android/releases/tag/0.0.7
[unreleased]: https://github.com/mimuc/app-ins-gruene/compare/0.1.0-beta.0...master
[0.1.0-beta.0]: https://github.com/mimuc/app-ins-gruene/compare/0.1.0-alpha.3...0.1.0-beta.0
[0.1.0-alpha.3]: https://github.com/mimuc/app-ins-gruene/compare/0.1.0-alpha.2...0.1.0-alpha.3
[0.1.0-alpha.2]: https://github.com/mimuc/app-ins-gruene/compare/0.1.0-alpha.1...0.1.0-alpha.2
[0.1.0-alpha.1]: https://github.com/mimuc/app-ins-gruene/compare/0.1.0-alpha.0...0.1.0-alpha.1
[0.1.0-alpha.0]: https://github.com/mimuc/app-ins-gruene/compare/0.0.7...0.1.0-alpha.0
[0.0.7]: https://github.com/mimuc/app-ins-gruene/releases/tag/0.0.7
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ alt="Download from Google Play"
height="80">](https://play.google.com/store/apps/details?id=de.lmu.treeapp)
[<img src=".github/assets/direct-apk-download.png"
alt="Direct apk download"
height="80">](https://github.com/lmu-informatics/app-ins-gruene/releases/latest)
height="80">](https://github.com/mimuc/app-ins-gruene/releases/latest)

# Table of Contents
- [About the App](#about-the-App)
Expand Down Expand Up @@ -57,13 +57,13 @@ cd path/to/your/directory
```
- Clone the project:
```
git clone https://github.com/lmu-informatics/app-ins-gruene.git
git clone https://github.com/mimuc/app-ins-gruene.git
```
- Now you are able to open the project in Android Studio.

### How to contribute
- Create an [issue](https://github.com/lmu-informatics/app-ins-gruene/issues), so we can discuss and monitor the topic.
- You can check and manage the state of your issues in the [Issue-Board](https://github.com/lmu-informatics/app-ins-gruene/projects).
- Create an [issue](https://github.com/mimuc/app-ins-gruene/issues), so we can discuss and monitor the topic.
- You can check and manage the state of your issues in the [Issue-Board](https://github.com/mimuc/app-ins-gruene/projects).
- Use the branch `master` as basis for a new branch `git checkout 123-my-issue`, where `123` is the issue number. Don't forget to update your master before checkout with `git pull origin master`.
- Make your changes, consider formatting them with your IDE (e.g. `Ctrl+Alt+L` in IntelliJ / AndroidStudio).
- Commit your changes, consider [cross-linking](https://docs.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue) the resolved issue with `(closes #123)` in your commit message.
Expand Down
9 changes: 4 additions & 5 deletions docs/playstore/whatsnew/whatsnew-de-DE
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
0.1.0-beta.2 - 2021-05-20
- Fehler behoben, um in der Lizenz-Seite zurück zu navigieren
- Hinzufügen einer Open Source Sektion in der "Über uns"-Seite
- Kleinere Verbesserungen auf der Profil-Seite
1.0.0 - 2024-08-07
- Erste stabile Veröffentlichung
- Aktualisiere Repository-Link
- Upgrade der Gradle-Abhängigkeiten
- Behalte verschleierte Quelldateien und Zeilennummern für Debugging
- Upgrade der App-Abhängigkeiten
7 changes: 3 additions & 4 deletions docs/playstore/whatsnew/whatsnew-en-US
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
0.1.0-beta.2 - 2021-05-20
- Fix navigate up on Licenses page
- Add Open Source Section in About page
- Minor improvements in Profile page
1.0.0 - 2024-08-07
- Initial stable release
- Update repository link
- Upgrade Gradle dependencies
- Keep obfuscated source files and lines for debugging
30 changes: 0 additions & 30 deletions tree-app-android/.idea/jarRepositories.xml

This file was deleted.

6 changes: 2 additions & 4 deletions tree-app-android/.idea/misc.xml

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

13 changes: 7 additions & 6 deletions tree-app-android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ android {
applicationId "de.lmu.treeapp"
minSdk 21
targetSdk 34
versionCode System.getenv("BUILD_NUMBER") as Integer ?: 16
versionCode System.getenv("BUILD_NUMBER") as Integer ?: 18
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -42,10 +42,11 @@ android {
}
buildFeatures {
dataBinding = true
buildConfig = true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
lint {
disable 'MissingTranslation'
Expand Down Expand Up @@ -83,7 +84,7 @@ dependencies {
implementation 'me.samlss:bloom:1.0.0'
implementation 'uk.co.samuelwall:material-tap-target-prompt:3.1.0'

testImplementation 'junit:junit:4.13.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
}
2 changes: 1 addition & 1 deletion tree-app-android/app/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=0.1.0-beta.3
version=1.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,18 @@
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;


import androidx.cardview.widget.CardView;
import androidx.fragment.app.Fragment;

import com.google.android.gms.common.util.ArrayUtils;

import java.util.Locale;

import de.lmu.treeapp.R;
import de.lmu.treeapp.activities.minigames.base.GameActivity_Base;
import de.lmu.treeapp.popup.Popup;
import de.lmu.treeapp.popup.PopupAction;
import de.lmu.treeapp.popup.PopupInterface;
import de.lmu.treeapp.popup.PopupType;

import java.util.Locale;

public class GameActivity_SlidePuzzle extends GameActivity_Base implements PopupInterface, Runnable {
DragDropGrid grid, gridFalse;
int dimension = 3;
Expand All @@ -45,27 +41,6 @@ enum BlossomType {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

setContentView(R.layout.activity_game__picture_puzzle);
Button helpButton = findViewById(R.id.helpImageButton);
Button continueButton = findViewById(R.id.continueButton);
doneButton = findViewById(R.id.game_picture_puzzle_sendButton);
Button falseTilesButton = findViewById(R.id.falseTilesButton);
imgView = findViewById(R.id.doneImage);
CardView helpView = findViewById(R.id.finishedImageView);
helpView.setVisibility(View.GONE);
doneButton.setVisibility(View.GONE);
popup = new Popup(this);
popup.setWinTitle(getString(R.string.slidepuzzle_wonderful));
doneButton.setOnClickListener(e -> {
setDone(true);
popup.showWithButtonText(PopupType.POSITIVE_ANIMATION, getString(R.string.popup_btn_finished), getString(R.string.popup_puzzle_won_text, time));
});

falseTilesButton.setOnClickListener(e -> gridFalse.markFalseTiles(grid.getFalseTiles()));

helpButton.setOnClickListener(e -> helpView.setVisibility(View.VISIBLE));
continueButton.setOnClickListener(e -> helpView.setVisibility(View.GONE));

int treeId = parentTree.getId();
if (ArrayUtils.contains(mwTrees, treeId)) {
int imgM = selectImage(BlossomType.male);
Expand All @@ -85,6 +60,28 @@ protected void onCreate(Bundle savedInstanceState) {
}

public void startPuzzle(BlossomType type) {
setContentView(R.layout.activity_game__slide_puzzle);
doneButton = findViewById(R.id.game_slide_puzzle_sendButton);

Button helpButton = findViewById(R.id.helpImageButton);
Button continueButton = findViewById(R.id.continueButton);
Button falseTilesButton = findViewById(R.id.falseTilesButton);
imgView = findViewById(R.id.doneImage);
CardView helpView = findViewById(R.id.finishedImageView);
helpView.setVisibility(View.GONE);
doneButton.setVisibility(View.GONE);
popup = new Popup(this);
popup.setWinTitle(getString(R.string.slidepuzzle_wonderful));
doneButton.setOnClickListener(e -> {
setDone(true);
popup.showWithButtonText(PopupType.POSITIVE_ANIMATION, getString(R.string.popup_btn_finished), getString(R.string.popup_puzzle_won_text, time));
});

falseTilesButton.setOnClickListener(e -> gridFalse.markFalseTiles(grid.getFalseTiles()));

helpButton.setOnClickListener(e -> helpView.setVisibility(View.VISIBLE));
continueButton.setOnClickListener(e -> helpView.setVisibility(View.GONE));

if (ArrayUtils.contains(mwTrees, treeId)) {
getSupportFragmentManager().beginTransaction()
.detach(imageSelectFragment).commit();
Expand Down Expand Up @@ -113,7 +110,7 @@ public void run() {

@Override
protected int getLayoutId() {
return R.layout.activity_game__picture_puzzle;
return R.layout.activity_game__slide_puzzle;
}

@Override
Expand Down

Large diffs are not rendered by default.

Loading