Skip to content

Stuff #23

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 12, 2018
Merged

Stuff #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad727e8
Add logs button to Login
jmattheis Nov 12, 2018
047b201
Use singleTask launch mode
jmattheis Nov 12, 2018
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
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
</activity>
<activity
android:name=".messages.MessagesActivity"
android:launchMode="singleTask"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar" />
<activity
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/com/github/gotify/login/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import com.github.gotify.client.model.VersionInfo;
import com.github.gotify.init.InitializationActivity;
import com.github.gotify.log.Log;
import com.github.gotify.log.LogsActivity;
import com.github.gotify.log.UncaughtExceptionHandler;
import com.squareup.okhttp.HttpUrl;
import java.io.InputStream;
Expand Down Expand Up @@ -118,6 +119,11 @@ public void doCheckUrl() {
.handleInUIThread(this, onValidUrl(fixedUrl), onInvalidUrl(fixedUrl));
}

@OnClick(R.id.open_logs)
public void openLogs() {
startActivity(new Intent(this, LogsActivity.class));
}

@OnClick(R.id.advanced_settings)
void toggleShowAdvanced() {
String selectedCertName =
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/layout/activity_login.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@
tools:context=".login.LoginActivity"
tools:layout_editor_absoluteY="25dp">

<Button
android:id="@+id/open_logs"
android:layout_width="50dp"
android:layout_height="40dp"
android:background="@null"
android:text="@string/logs"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ProgressBar
android:id="@+id/checkurl_progress"
android:layout_width="49dp"
Expand Down