Skip to content

Commit

Permalink
Updated
Browse files Browse the repository at this point in the history
  • Loading branch information
arefbhrn committed Nov 6, 2019
1 parent 04a71fd commit 40cf1c1
Show file tree
Hide file tree
Showing 13 changed files with 11 additions and 79 deletions.
8 changes: 0 additions & 8 deletions app/src/main/res/drawable/ic_close.xml

This file was deleted.

8 changes: 0 additions & 8 deletions app/src/main/res/drawable/ic_flash.xml

This file was deleted.

2 changes: 1 addition & 1 deletion lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ android {

buildTypes {
release {
minifyEnabled true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
Expand Down
54 changes: 1 addition & 53 deletions lib/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -18,56 +18,4 @@

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

-printmapping out.map
-keepparameternames
-renamesourcefileattribute SourceFile
-keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,EnclosingMethod

# Preserve all annotations.

-keepattributes *Annotation*

# Preserve all public classes, and their public and protected fields and
# methods.

-keep public class * {
public protected *;
}

# Preserve all .class method names.

-keepclassmembernames class * {
java.lang.Class class$(java.lang.String);
java.lang.Class class$(java.lang.String, boolean);
}

# Preserve all native method names and the names of their classes.

-keepclasseswithmembernames class * {
native <methods>;
}

# Preserve the special static methods that are required in all enumeration
# classes.

-keepclassmembers class * extends java.lang.Enum {
public static **[] values();
public static ** valueOf(java.lang.String);
}

# Explicitly preserve all serialization members. The Serializable interface
# is only a marker interface, so it wouldn't save them.
# You can comment this out if your library doesn't use serialization.
# If your code contains serializable classes that have to be backward
# compatible, please refer to the manual.

-keepclassmembers class * implements java.io.Serializable {
static final long serialVersionUID;
static final java.io.ObjectStreamField[] serialPersistentFields;
private void writeObject(java.io.ObjectOutputStream);
private void readObject(java.io.ObjectInputStream);
java.lang.Object writeReplace();
java.lang.Object readResolve();
}
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class ScanActivityImpl extends ScanBaseActivity {

protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_scan_card);
setContentView(R.layout.irdcs_activity_scan_card);

String scanCardText = getIntent().getStringExtra(SCAN_CARD_TEXT);
if (!TextUtils.isEmpty(scanCardText)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/flashlight" />
<item android:state_pressed="true" android:drawable="@drawable/flashlight_pressed" />
<item android:state_pressed="false" android:drawable="@drawable/irdcs_ic_close_white" />
<item android:state_pressed="true" android:drawable="@drawable/irdcs_close_white_pressed" />
</selector>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false" android:drawable="@drawable/ic_close_white" />
<item android:state_pressed="true" android:drawable="@drawable/close_white_pressed" />
<item android:state_pressed="false" android:drawable="@drawable/irdcs_flashlight" />
<item android:state_pressed="true" android:drawable="@drawable/irdcs_flashlight_pressed" />
</selector>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:alpha="0.5"
android:src="@drawable/ic_close_white" />
android:src="@drawable/irdcs_ic_close_white" />
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
android:layout_height="32dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/card_scan_close_button"
android:background="@drawable/irdcs_card_scan_close_button"
app:layout_constraintEnd_toEndOf="@+id/texture"
app:layout_constraintTop_toTopOf="@+id/texture" />

Expand All @@ -39,7 +39,7 @@
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@drawable/card_rectangle"
android:background="@drawable/irdcs_card_rectangle"
app:layout_constraintBottom_toBottomOf="@+id/texture"
app:layout_constraintDimensionRatio="H,480:302"
app:layout_constraintEnd_toEndOf="parent"
Expand Down Expand Up @@ -86,7 +86,7 @@
android:id="@+id/flashlightButton"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/card_scan_torch_button"
android:background="@drawable/irdcs_card_scan_torch_button"
app:layout_constraintBottom_toBottomOf="@+id/texture"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down

0 comments on commit 40cf1c1

Please sign in to comment.