Skip to content

Commit

Permalink
rfct: Migrate to Backpack library
Browse files Browse the repository at this point in the history
  • Loading branch information
cyb3rko committed Mar 30, 2023
1 parent c4b6eae commit 07ca36d
Show file tree
Hide file tree
Showing 63 changed files with 202 additions and 3,605 deletions.
13 changes: 2 additions & 11 deletions app/build.gradle
Expand Up @@ -62,21 +62,12 @@ android {
}
}
}
tasks.named('lintKotlinMain') {
exclude 'com/cyb3rko/pincredible/crypto/xxhash3/*.kt'
}
tasks.named('formatKotlinMain') {
exclude 'com/cyb3rko/pincredible/crypto/xxhash3/*.kt'
}

dependencies {
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'com.google.android.material:material:1.7.0'
implementation "androidx.preference:preference-ktx:$preference_version"
implementation project(path: ':backpack')

// androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
// androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand Down
4 changes: 1 addition & 3 deletions app/proguard-rules.pro
Expand Up @@ -20,6 +20,4 @@
# hide the original source file name.
#-renamesourcefileattribute SourceFile

-keep class com.cyb3rko.pincredible.** {
<methods>;
}
-keep class com.cyb3rko.pincredible.** { **; }
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Expand Up @@ -6,7 +6,7 @@
<uses-permission android:name="android.permission.VIBRATE" />

<application
android:name=".App"
android:name="com.cyb3rko.backpack.BackpackApplication"
android:allowBackup="false"
android:dataExtractionRules="@xml/data_extraction_rules"
android:enableOnBackInvokedCallback="true"
Expand Down
33 changes: 4 additions & 29 deletions app/src/main/kotlin/com/cyb3rko/pincredible/MainActivity.kt
Expand Up @@ -17,44 +17,19 @@
package com.cyb3rko.pincredible

import android.os.Bundle
import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.findNavController
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.navigateUp
import androidx.navigation.ui.setupActionBarWithNavController
import com.cyb3rko.backpack.activities.BackpackMainActivity
import com.cyb3rko.pincredible.databinding.ActivityMainBinding

class MainActivity : AppCompatActivity() {
private lateinit var appBarConfiguration: AppBarConfiguration
class MainActivity : BackpackMainActivity() {
private lateinit var binding: ActivityMainBinding

override fun onCreate(savedInstanceState: Bundle?) {
if (!BuildConfig.DEBUG) {
window.setFlags(
WindowManager.LayoutParams.FLAG_SECURE,
WindowManager.LayoutParams.FLAG_SECURE
)
}
super.onCreate(savedInstanceState)
Thread.setDefaultUncaughtExceptionHandler(ExceptionHandler(this))

binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)

binding = ActivityMainBinding.inflate(layoutInflater).asContentView()
setSupportActionBar(binding.toolbar)

val navController = findNavController(R.id.nav_host_fragment_content_main)
appBarConfiguration = AppBarConfiguration(navController.graph)
setupActionBarWithNavController(navController, appBarConfiguration)
}

internal fun showSubtitle(show: Boolean = true) {
binding.toolbar.subtitle = if (show) getString(R.string.version_name) else ""
}

override fun onSupportNavigateUp(): Boolean {
val navController = findNavController(R.id.nav_host_fragment_content_main)
return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
findNavController(R.id.nav_host_fragment_content_main).applyToActionBar()
}
}
67 changes: 0 additions & 67 deletions app/src/main/kotlin/com/cyb3rko/pincredible/Settings.kt

This file was deleted.

42 changes: 42 additions & 0 deletions app/src/main/kotlin/com/cyb3rko/pincredible/SettingsActivity.kt
@@ -0,0 +1,42 @@
/*
* Copyright (c) 2023 Cyb3rKo
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.cyb3rko.pincredible

import android.os.Bundle
import com.cyb3rko.backpack.activities.BackpackSettingsActivity
import com.cyb3rko.backpack.fragments.BackpackSettingsFragment
import com.cyb3rko.backpack.interfaces.BackpackSettings
import com.cyb3rko.pincredible.fragments.SettingsFragment

internal class SettingsActivity : BackpackSettingsActivity(), BackpackSettings {
override fun onCreate(savedInstanceState: Bundle?) {
bindInterface(this)
super.onCreate(savedInstanceState)
}

override fun getPreferences(): Int {
return R.xml.preferences
}

override fun getSettingsFragment(): BackpackSettingsFragment {
return SettingsFragment()
}

companion object {
const val KEY_BUTTON_RANDOMIZER = "button_randomizer"
}
}
Expand Up @@ -21,10 +21,10 @@ import android.util.Log
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.WindowCompat
import com.cyb3rko.backpack.utils.openUrl
import com.cyb3rko.backpack.utils.showToast
import com.cyb3rko.backpack.utils.storeToClipboard
import com.cyb3rko.pincredible.databinding.ActivityUncaughtExceptionBinding
import com.cyb3rko.pincredible.utils.openUrl
import com.cyb3rko.pincredible.utils.showToast
import com.cyb3rko.pincredible.utils.storeToClipboard

class UncaughtExceptionActivity : AppCompatActivity() {
private lateinit var binding: ActivityUncaughtExceptionBinding
Expand Down

0 comments on commit 07ca36d

Please sign in to comment.