Verbessere Credits

master
Niko Diamadis 5 years ago
parent 603fcd1797
commit 8096b4c4c1

@ -73,15 +73,15 @@ dependencies {
implementation 'com.afollestad.material-dialogs:input:3.3.0'
implementation 'com.airbnb.android:lottie:3.6.0'
implementation 'com.amitshekhar.android:android-networking:1.0.2'
implementation 'com.github.cyb3rko:about-icons:1.2.1'
implementation 'com.github.cyb3rko:about-icons:1.4.0'
implementation 'com.github.GrenderG:Toasty:1.5.0'
implementation 'com.github.medyo:android-about-page:1.3'
implementation "com.github.parse-community.Parse-SDK-Android:parse:1.26.0"
implementation 'com.google.android.material:material:1.3.0-alpha03'
implementation 'com.google.firebase:firebase-crashlytics-ktx:17.3.0'
implementation 'com.itextpdf:itextpdf:5.5.13.2'
implementation "com.mikepenz:aboutlibraries:$about_libraries_version"
implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version"
implementation 'io.github.medyo:android-about-page:2.0.0'
implementation 'me.ibrahimyilmaz:kiel:1.1.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation project(':installer')

@ -24,10 +24,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.cyb3rko.techniklogger.utils.About"
android:screenOrientation="portrait" />
<activity android:name="com.cyb3rko.techniklogger.utils.IconCredits"
android:screenOrientation="portrait" />
<activity android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"
android:theme="@style/NoActionBar"
android:screenOrientation="portrait" />

@ -10,6 +10,7 @@ import android.view.Menu
import android.view.MenuItem
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import androidx.navigation.NavController
import androidx.navigation.findNavController
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.setupActionBarWithNavController
@ -20,12 +21,12 @@ import com.androidnetworking.AndroidNetworking
import com.androidnetworking.error.ANError
import com.androidnetworking.interfaces.StringRequestListener
import com.cyb3rko.techniklogger.databinding.ActivityMainBinding
import com.cyb3rko.techniklogger.utils.About
import java.util.*
class MainActivity : AppCompatActivity() {
private var _binding: ActivityMainBinding? = null
private lateinit var navController: NavController
private lateinit var sharedPref: SharedPreferences
private lateinit var sharedPrefEditor: SharedPreferences.Editor
@ -39,7 +40,7 @@ class MainActivity : AppCompatActivity() {
_binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
val navController = findNavController(R.id.nav_host_fragment_activity_main)
navController = findNavController(R.id.nav_host_fragment_activity_main)
// Passing each menu ID as a set of Ids because each
// menu should be considered as top level destinations.
val appBarConfiguration = AppBarConfiguration(setOf(R.id.navigation_listing))
@ -105,7 +106,6 @@ class MainActivity : AppCompatActivity() {
}
override fun onSupportNavigateUp(): Boolean {
val navController = findNavController(R.id.nav_host_fragment_activity_main)
return navController.navigateUp() || super.onSupportNavigateUp()
}
@ -121,7 +121,7 @@ class MainActivity : AppCompatActivity() {
// as you specify a parent activity in AndroidManifest.xml.
when (item.itemId) {
R.id.action_rename -> showNameDialog()
R.id.action_about -> startActivity(Intent(applicationContext, About::class.java))
R.id.action_about -> navController.navigate(R.id.navigation_about)
}
return super.onOptionsItemSelected(item)

@ -0,0 +1,53 @@
package com.cyb3rko.techniklogger.fragments
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import com.cyb3rko.techniklogger.BuildConfig
import com.cyb3rko.techniklogger.R
import com.mikepenz.aboutlibraries.LibsBuilder
import mehdi.sakout.aboutpage.AboutPage
import mehdi.sakout.aboutpage.Element
class AboutFragment : Fragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
super.onCreateView(inflater, container, savedInstanceState)
return AboutPage(context)
.setImage(R.mipmap.ic_launcher_foreground)
.setDescription("App zur Vereinfachung des Protokollierens aller Technik-Einsätze")
.addItem(Element().setTitle("Version ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
.setIconDrawable(R.drawable.about_icon_github))
.addGroup("Credits")
.addItem(Element().setTitle("Benutzte Libraries").setIconDrawable(R.drawable._icon_libraries).setOnClickListener(showLibraries()))
.addItem(Element().setTitle("Benutzte Icons").setIconDrawable(R.drawable._icon_question).setOnClickListener {
findNavController().navigate(R.id.navigation_about_icons)
})
.create()
}
private fun showLibraries() : View.OnClickListener {
return View.OnClickListener {
context?.let { trueContext ->
LibsBuilder()
.withShowLoadingProgress(true)
.withAboutVersionShownCode(false)
.withAboutVersionShownName(false)
.withFields(R.string::class.java.fields)
.withAutoDetect(true)
.withAboutIconShown(false)
.withAboutVersionShown(false)
.withVersionShown(true)
.withLicenseDialog(true)
.withLicenseShown(true)
.withCheckCachedDetection(true)
.withSortEnabled(true)
.start(trueContext)
}
}
}
}

@ -0,0 +1,19 @@
package com.cyb3rko.techniklogger.fragments
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import com.cyb3rko.abouticons.AboutIcons
import com.cyb3rko.techniklogger.R
class AboutIconsFragment : Fragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
super.onCreateView(inflater, container, savedInstanceState)
val aboutIcons = AboutIcons(requireContext(), R.drawable::class.java).setTitle("Benutzte Icons")
return aboutIcons.get()
}
}

@ -1,66 +0,0 @@
package com.cyb3rko.techniklogger.utils
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.view.MenuItem
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import com.cyb3rko.techniklogger.BuildConfig
import com.cyb3rko.techniklogger.R
import com.mikepenz.aboutlibraries.LibsBuilder
import mehdi.sakout.aboutpage.AboutPage
import mehdi.sakout.aboutpage.Element
class About : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
val aboutPage: View = AboutPage(this)
.setImage(R.mipmap.ic_launcher_foreground)
.setDescription("App zur Vereinfachung des Protokollierens aller Technik-Einsätze")
.addItem(Element().setTitle("Version ${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
.setIconDrawable(R.drawable.about_icon_github))
.addGroup("Credits")
.addItem(Element().setTitle("Benutzte Libraries").setIconDrawable(R.drawable._icon_libraries).setOnClickListener(showLibraries()))
// .addItem(Element().setTitle("Benutzte Icons").setIconDrawable(R.drawable._icon_question).setOnClickListener {
// startActivity(Intent(applicationContext, IconCredits::class.java))
// })
.create()
setContentView(aboutPage)
}
private fun showLibraries() : View.OnClickListener {
return View.OnClickListener {
LibsBuilder()
.withShowLoadingProgress(true)
.withAboutVersionShownCode(false)
.withAboutVersionShownName(false)
.withFields(R.string::class.java.fields)
.withAutoDetect(true)
.withAboutIconShown(false)
.withAboutVersionShown(false)
.withVersionShown(true)
.withLicenseDialog(true)
.withLicenseShown(true)
.withCheckCachedDetection(true)
.withSortEnabled(true)
.start(application)
}
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
when (item.itemId) {
android.R.id.home -> finish()
}
return super.onOptionsItemSelected(item)
}
}

@ -1,15 +0,0 @@
package com.cyb3rko.techniklogger.utils
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.cyb3rko.abouticons.AboutIcons
import com.cyb3rko.techniklogger.R
class IconCredits : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(AboutIcons(this, R.drawable::class.java).setTitle("Benutzte Icons").get())
}
}

@ -66,4 +66,13 @@
android:defaultValue=""/>
</fragment>
<fragment
android:id="@+id/navigation_about"
android:name="com.cyb3rko.techniklogger.fragments.AboutFragment"
android:label="Über" />
<fragment
android:id="@+id/navigation_about_icons"
android:name="com.cyb3rko.techniklogger.fragments.AboutIconsFragment"
android:label="Über" />
</navigation>

@ -8,7 +8,7 @@
<item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
</style>
<style name="NoActionBar" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
<style name="NoActionBar" parent="Theme.MaterialComponents.DayNight.DarkActionBar.Bridge">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>

Loading…
Cancel
Save