Skip to content

Commit

Permalink
some bug fixed.
Browse files Browse the repository at this point in the history
  • Loading branch information
kyawhtut-cu committed Oct 13, 2022
1 parent 4be9544 commit 97fb530
Show file tree
Hide file tree
Showing 20 changed files with 60 additions and 253 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*.iml
.gradle
.idea/
/local.properties
/.idea/caches
/.idea/libraries
Expand Down
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

145 changes: 0 additions & 145 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/compiler.xml

This file was deleted.

35 changes: 0 additions & 35 deletions .idea/gradle.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

30 changes: 0 additions & 30 deletions .idea/jarRepositories.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

2 changes: 2 additions & 0 deletions buildSrc/src/main/java/Libs.kt
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,6 @@ object Libs {

const val leakCanary = "com.squareup.leakcanary:leakcanary-android:${Versions.leakCanaryVersion}"
const val leakCanaryNoOP = "com.squareup.leakcanary:leakcanary-android-no-op:${Versions.leakCanaryVersion}"

const val realTimeBlur = "com.github.mmin18:realtimeblurview:${Versions.realTimeBlurVersion}"
}
2 changes: 2 additions & 0 deletions buildSrc/src/main/java/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,6 @@ object Versions {
const val easyPermissionVersion = "3.0.0"
const val googleZxingVersion = "3.3.3"
const val leakCanaryVersion = "1.5.4"

const val realTimeBlurVersion = "1.2.1"
}
3 changes: 2 additions & 1 deletion msubpc/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
/build
src/androidTest/java/com/kyawhut/atsycast/msubpc/DecryptionTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.kyawhut.atsycast.msubpc

import androidx.test.ext.junit.runners.AndroidJUnit4
import com.kyawhut.atsycast.msubpc.utils.AesEncryptDecrypt
import org.junit.Assert
import org.junit.Test
import org.junit.runner.RunWith

/**
* @author kyawhtut
* @date 7/20/22
*/
@RunWith(AndroidJUnit4::class)
class DecryptionTest {

@Test
fun testDecryption() {
val encryptedURL =
"eyJpdiI6IjMybmI2Z2dwNS9GdHhUeDhCRmRPeGc9PSIsInZhbHVlIjoibmxZVU4ydjFyakoxdUw0STBxU3ozaXl6cjE0K08yOFM0U1ByeHFVSTdzRDFiUlBLMDhhWDROUmYvUHhGRCt6a2NHOEg3cDlIV3RqRzRjVERJZnZ6STRRY0hRVCtQdjdBU0loSllvQzB4VTJmb3BiMXN4bmNyL0xsczNVRUsxRWFJV2ptV1VUK2FvSVVDM1Zpb1dKRUR3PT0iLCJtYWMiOiJhZTk2NWM3NzQxZGQwMTNmNjBiMzJhMjI3NjIwOTVjMDVlYTU3YmNmZjk3YWQzMDY5NjAxNGFjMzNjZjgzYjY3In0="
val decrypted = AesEncryptDecrypt.getDecryptedString(encryptedURL)
Assert.assertEquals("com.kyawhut.atsycast.msubpc.test", decrypted)
}
}
3 changes: 3 additions & 0 deletions share/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,7 @@ dependencies {
implementation(Libs.lottie)

implementation(Libs.googleZxing)

// realTimeBlur - https://github.com/mmin18/RealtimeBlurView
implementation(Libs.realTimeBlur)
}
16 changes: 14 additions & 2 deletions share/src/main/res/layout/atsy_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:alpha="@{showFullDetail ? 0.7F : 0.35F}"
android:alpha="0.35"
android:background="@color/colorBlack"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -103,7 +103,6 @@
android:id="@+id/view_detail"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="@{showFullDetail ? View.GONE : View.VISIBLE}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -300,6 +299,18 @@

</androidx.constraintlayout.widget.ConstraintLayout>

<com.github.mmin18.widget.RealtimeBlurView
android:id="@+id/view_blur"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="@{showFullDetail ? View.VISIBLE : View.GONE}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:realtimeBlurRadius="@dimen/margin_medium"
app:realtimeOverlayColor="#cc000000" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/view_full_description"
android:layout_width="0dp"
Expand Down Expand Up @@ -331,6 +342,7 @@
android:id="@+id/scroll"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="@dimen/margin_small"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingBottom="@dimen/margin_xlarge"
Expand Down
11 changes: 11 additions & 0 deletions tv/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,17 @@ android {
}
}

packagingOptions {
exclude("META-INF/DEPENDENCIES")
exclude("META-INF/LICENSE")
exclude("META-INF/LICENSE.txt")
exclude("META-INF/license.txt")
exclude("META-INF/NOTICE")
exclude("META-INF/NOTICE.txt")
exclude("META-INF/notice.txt")
exclude("META-INF/ASL2.0")
}

buildFeatures {
dataBinding = true
viewBinding = true
Expand Down
2 changes: 1 addition & 1 deletion tv/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
tools:targetApi="m">

<activity
android:name=".ui.splash.SplashActivity"
android:name=".ui.drivetest.DriveTestActivity"
android:screenOrientation="sensorLandscape"
android:theme="@style/BaseTvTheme">
<intent-filter>
Expand Down
Loading

0 comments on commit 97fb530

Please sign in to comment.