Skip to content

Commit

Permalink
Fixed LoginActivity back button press & updated gitignore 😁
Browse files Browse the repository at this point in the history
  • Loading branch information
jiangshen committed Nov 10, 2019
1 parent e37017d commit 855d902
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ captures/
.navigation/
captures/
proguard/
app/release/
app/src/main/*.xml
app/src/main/res/values/*.xml

Expand Down
22 changes: 14 additions & 8 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,21 @@

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
#-keepattributes SourceFile,LineNumberTable

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

-keepattributes Signature
-keepattributes *Annotation*
# FireBase Ignore
-keep class com.caden.drawing.wurmpaint.Wurm { *; }
-Keep class com.caden.drawing.wurmpaint.DrawModel.LineElem { *; }
-keep class com.google.firebase.** { *; }
-keepattributes *Annotation*

# Keep these files that FireBase need to correctly send and receive data
-keep class com.google.firebase.** { *; }
-keep class com.caden.drawing.wurmpaint.** { *; }
#-keep class com.caden.drawing.wurmpaint.DrawModel.** { *; }
#-keep class com.caden.drawing.wurmpaint.DrawRenderer.** { *; }
#-keep class com.caden.drawing.wurmpaint.DrawView.** { *; }
#-keep class com.caden.drawing.wurmpaint.Wurm.** { *; }
#-keep class com.caden.drawing.wurmpaint.DrawingActivity.** { *; }
#-keep class com.caden.drawing.wurmpaint.SharedData.** { *; }
2 changes: 1 addition & 1 deletion app/release/output.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":9},"path":"app-release.apk","properties":{"packageId":"com.caden.drawing.wurmpaint","split":"","minSdkVersion":"21"}}]
[{"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":{}}]
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
return true;
}

@Override
public void onBackPressed() {}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.menu_info) {
Expand Down

0 comments on commit 855d902

Please sign in to comment.