Skip to content

Commit

Permalink
big update
Browse files Browse the repository at this point in the history
update dependecies
add lottie animation
and more optimization
  • Loading branch information
Kry9toN committed Sep 5, 2023
1 parent 908f8b6 commit b9bc779
Show file tree
Hide file tree
Showing 86 changed files with 157 additions and 106 deletions.
6 changes: 4 additions & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 22 additions & 20 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Properties properties = new Properties()
properties.load(project.rootProject.file("local.properties").newDataInputStream())

android {
compileSdk 31
compileSdk 34

signingConfigs {
sign {
Expand All @@ -20,9 +20,9 @@ android {
defaultConfig {
applicationId "krypton.maulidsimtudduror.sabilutaubah"
minSdk 21
targetSdk 31
versionCode 10207
versionName "1.2.7"
targetSdk 34
versionCode 10304
versionName "1.3.4"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand Down Expand Up @@ -51,7 +51,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion compose_version
kotlinCompilerExtensionVersion "1.3.2"
}
packagingOptions {
resources {
Expand All @@ -64,28 +64,30 @@ android {
lint {
checkReleaseBuilds false
}
namespace 'krypton.maulidsimtudduror.sabilutaubah'
}

dependencies {

implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
implementation 'androidx.activity:activity-compose:1.4.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.2'

implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation "androidx.compose.material:material-icons-extended:$compose_version"
implementation "androidx.compose.ui:ui:1.6.0-alpha04"
implementation "androidx.compose.material3:material3:1.2.0-alpha06"
implementation "androidx.compose.ui:ui-tooling-preview:1.6.0-alpha04"
implementation "androidx.compose.material:material-icons-extended:1.6.0-alpha04"

implementation "com.google.accompanist:accompanist-insets-ui:0.24.1-alpha"
implementation "com.google.accompanist:accompanist-systemuicontroller:0.24.1-alpha"
implementation "com.google.accompanist:accompanist-insets-ui:0.30.1"
implementation "com.google.accompanist:accompanist-systemuicontroller:0.30.1"

implementation 'com.github.alorma:compose-settings-ui:0.7.2'
implementation 'com.github.alorma:compose-settings-ui:0.27.0'
implementation "com.airbnb.android:lottie-compose:4.0.0"

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.compose.material:material-icons-extended:$compose_version"
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.0-alpha04"
debugImplementation "androidx.compose.ui:ui-tooling:1.6.0-alpha04"
debugImplementation "androidx.compose.material:material-icons-extended:1.6.0-alpha04"
}
7 changes: 3 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="krypton.maulidsimtudduror.sabilutaubah">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand All @@ -10,16 +9,16 @@
android:supportsRtl="true"
android:theme="@style/Theme.MaulidSimtudDuror">
<activity
android:name=".main.MainActivity"
android:name=".splash.SplashScreen"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.MaulidSimtudDuror">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".main.MainActivity" />
<activity android:name=".view.ViewImage" />
<activity android:name=".info.AboutUs" />
</application>
Expand Down
Binary file modified app/src/main/assets/0/Maulid-SimtudDuror_page-0004.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/assets/0/Maulid-SimtudDuror_page-0005.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/assets/1/Maulid-SimtudDuror_page-0007.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/assets/1/Maulid-SimtudDuror_page-0008.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file modified app/src/main/ic_launcher-playstore.png
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
package krypton.maulidsimtudduror.sabilutaubah.info

import android.annotation.SuppressLint
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.material.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.*
import androidx.compose.material.icons.outlined.Code
import androidx.compose.material.icons.outlined.Collections
import androidx.compose.material.icons.outlined.Info
import androidx.compose.material.icons.outlined.TheaterComedy
import androidx.compose.runtime.SideEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.core.view.WindowCompat
Expand All @@ -31,8 +35,9 @@ import com.google.accompanist.insets.ui.TopAppBar
import com.google.accompanist.systemuicontroller.rememberSystemUiController
import krypton.maulidsimtudduror.sabilutaubah.BuildConfig
import krypton.maulidsimtudduror.sabilutaubah.R
import krypton.maulidsimtudduror.sabilutaubah.main.MainActivity.Companion.appContext
import krypton.maulidsimtudduror.sabilutaubah.lottie.AboutAnimation
import krypton.maulidsimtudduror.sabilutaubah.ui.theme.appTheme
import krypton.maulidsimtudduror.sabilutaubah.utils.openUrl
import kotlin.random.Random

class AboutUs: ComponentActivity() {
Expand All @@ -41,10 +46,14 @@ class AboutUs: ComponentActivity() {
val dialogToastArray = listOf(
"Ngapain...?",
"Ga boleh gitu.",
"Yahaha"
"Yahaha",
"Info..?",
"Pusat",
"ST Nyell"
)
}

@SuppressLint("UnusedMaterialScaffoldPaddingParameter")
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
WindowCompat.setDecorFitsSystemWindows(window, false)
Expand Down Expand Up @@ -72,6 +81,7 @@ class AboutUs: ComponentActivity() {
Text(
text = stringResource(id = R.string.about_app),
style = MaterialTheme.typography.subtitle2,
color = MaterialTheme.colors.primary,
fontSize = 18.sp,
modifier = Modifier.align(Alignment.CenterHorizontally)
)
Expand Down Expand Up @@ -114,6 +124,13 @@ class AboutUs: ComponentActivity() {
subtitle = { Text(text = "Untuk kenikmatan yang sudah di berikan kepada kita") },
onClick = {}
)
SettingsMenuLink(
title = { Text(text = "Gust Iqdam") },
subtitle = { Text(text = "Sebagai guru dan pembimbing kita") },
onClick = {
openUrl(this@AboutUs, "https://www.instagram.com/iqdammuhammad_/")
}
)
Spacer(modifier = Modifier.size(10.dp))
Column(modifier = Modifier
.padding(start = 15.dp, bottom = 5.dp)
Expand All @@ -131,16 +148,10 @@ class AboutUs: ComponentActivity() {
contentDescription = "developer"
)
},
title = { Text(text = "Developer") },
subtitle = { Text(text = "Dhimas") },
title = { Text(text = "Dhimas") },
subtitle = { Text(text = "Developer") },
) {
try {
startActivity(
Intent(Intent.ACTION_VIEW)
.setData(Uri.parse("https://github.com/Kry9toN/"))
)
} catch (e: Throwable) {
}
openUrl(this@AboutUs, "https://github.com/Kry9toN/")
}
SettingsMenuLink(
icon = {
Expand All @@ -149,8 +160,8 @@ class AboutUs: ComponentActivity() {
contentDescription = "developer"
)
},
title = { Text(text = "Asset Management") },
subtitle = { Text(text = "Irfan") },
title = { Text(text = "Irfan") },
subtitle = { Text(text = "Asset Management") },
onClick = {}
)
SettingsMenuLink(
Expand All @@ -160,8 +171,8 @@ class AboutUs: ComponentActivity() {
contentDescription = "developer"
)
},
title = { Text(text = "Support System") },
subtitle = { Text(text = "Bowo") },
title = { Text(text = "Bowo") },
subtitle = { Text(text = "Support System") },
onClick = {}
)
SettingsMenuLink(
Expand All @@ -171,8 +182,8 @@ class AboutUs: ComponentActivity() {
contentDescription = "developer"
)
},
title = { Text(text = "Support System") },
subtitle = { Text(text = "Aji") },
title = { Text(text = "Aji") },
subtitle = { Text(text = "Support System") },
onClick = {}
)
SettingsMenuLink(
Expand All @@ -182,8 +193,8 @@ class AboutUs: ComponentActivity() {
contentDescription = "developer"
)
},
title = { Text(text = "Support System") },
subtitle = { Text(text = "Sarkon") },
title = { Text(text = "Sarkon") },
subtitle = { Text(text = "Support System") },
onClick = {}
)
SettingsMenuLink(
Expand All @@ -193,8 +204,8 @@ class AboutUs: ComponentActivity() {
contentDescription = "developer"
)
},
title = { Text(text = "Support System") },
subtitle = { Text(text = "Agil") },
title = { Text(text = "Agil") },
subtitle = { Text(text = "Support System") },
onClick = {}
)
SettingsMenuLink(
Expand All @@ -204,8 +215,8 @@ class AboutUs: ComponentActivity() {
contentDescription = "developer"
)
},
title = { Text(text = "Support System") },
subtitle = { Text(text = "Ipen") },
title = { Text(text = "Ipen") },
subtitle = { Text(text = "Support System") },
onClick = {}
)
Spacer(modifier = Modifier.size(10.dp))
Expand All @@ -232,6 +243,7 @@ class AboutUs: ComponentActivity() {
},
)
}
AboutAnimation()
}
}
}
Expand All @@ -241,10 +253,10 @@ class AboutUs: ComponentActivity() {
private fun onButtonClick2() {
COUNT_CLICK += 1
when (COUNT_CLICK) {
1 -> Toast.makeText(appContext, "Tekan 3 kali lagi....", Toast.LENGTH_SHORT).show()
1 -> Toast.makeText(this, "Tekan 3 kali lagi....", Toast.LENGTH_SHORT).show()
4 -> {
val randomIndex = Random.nextInt(dialogToastArray.size)
Toast.makeText(appContext, dialogToastArray[randomIndex], Toast.LENGTH_LONG).show()
Toast.makeText(this, dialogToastArray[randomIndex], Toast.LENGTH_LONG).show()
COUNT_CLICK = 0
}
}
Expand Down
Loading

0 comments on commit b9bc779

Please sign in to comment.