Skip to content

Commit 855d902

Browse files
committed
Fixed LoginActivity back button press & updated gitignore 😁
1 parent e37017d commit 855d902

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ captures/
4444
.navigation/
4545
captures/
4646
proguard/
47+
app/release/
4748
app/src/main/*.xml
4849
app/src/main/res/values/*.xml
4950

app/proguard-rules.pro

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,21 @@
1818

1919
# Uncomment this to preserve the line number information for
2020
# debugging stack traces.
21-
#-keepattributes SourceFile,LineNumberTable
21+
#-keepattributes SourceFile,LineNumberTable
2222

2323
# If you keep the line number information, uncomment this to
24-
# hide the original source file name.
25-
#-renamesourcefileattribute SourceFile
24+
# hide the original source file name.
25+
#-renamesourcefileattribute SourceFile
2626

2727
-keepattributes Signature
28-
-keepattributes *Annotation*
29-
# FireBase Ignore
30-
-keep class com.caden.drawing.wurmpaint.Wurm { *; }
31-
-Keep class com.caden.drawing.wurmpaint.DrawModel.LineElem { *; }
32-
-keep class com.google.firebase.** { *; }
28+
-keepattributes *Annotation*
29+
30+
# Keep these files that FireBase need to correctly send and receive data
31+
-keep class com.google.firebase.** { *; }
32+
-keep class com.caden.drawing.wurmpaint.** { *; }
33+
#-keep class com.caden.drawing.wurmpaint.DrawModel.** { *; }
34+
#-keep class com.caden.drawing.wurmpaint.DrawRenderer.** { *; }
35+
#-keep class com.caden.drawing.wurmpaint.DrawView.** { *; }
36+
#-keep class com.caden.drawing.wurmpaint.Wurm.** { *; }
37+
#-keep class com.caden.drawing.wurmpaint.DrawingActivity.** { *; }
38+
#-keep class com.caden.drawing.wurmpaint.SharedData.** { *; }

app/release/output.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":9},"path":"app-release.apk","properties":{"packageId":"com.caden.drawing.wurmpaint","split":"","minSdkVersion":"21"}}]
1+
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"2.07","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/java/com/caden/drawing/wurmpaint/LoginActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
8686
return true;
8787
}
8888

89+
@Override
90+
public void onBackPressed() {}
91+
8992
@Override
9093
public boolean onOptionsItemSelected(MenuItem item) {
9194
if (item.getItemId() == R.id.menu_info) {

0 commit comments

Comments
 (0)