Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
renetik committed Jun 21, 2022
1 parent b4f2de2 commit eefe9f3
Show file tree
Hide file tree
Showing 37 changed files with 135 additions and 262 deletions.
2 changes: 0 additions & 2 deletions library/renetik-android-controller-maps/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
implementation project(':renetik-android-json')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="renetik.android.maps">

<application>
<!--This require maps api for android 28-->
<!--https://developers.google.com/maps/documentation/android-sdk/config#specify_requirement_for_apache_http_legacy_library-->
<uses-library
android:name="org.apache.http.legacy"
android:required="false" />
</application>
</manifest>
<manifest package="renetik.android.maps" />
2 changes: 0 additions & 2 deletions library/renetik-android-controller/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
implementation project(':renetik-android-event')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import android.widget.FrameLayout
import android.widget.FrameLayout.LayoutParams
import androidx.core.view.updateLayoutParams
import renetik.android.R.color
import renetik.android.R.layout
import renetik.android.ui.R.color
import renetik.android.ui.R.layout
import renetik.android.core.extensions.content.color
import renetik.android.core.extensions.content.dpToPixelF
import renetik.android.core.extensions.content.statusBarHeight
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import androidx.annotation.AnimRes
import renetik.android.controller.R

enum class CSNavigationAnimation(@AnimRes val resource: Int) {
FadeIn(renetik.android.R.anim.cs_fade_in),
FadeOut(renetik.android.R.anim.cs_fade_out),
FadeIn(renetik.android.ui.R.anim.cs_fade_in),
FadeOut(renetik.android.ui.R.anim.cs_fade_out),
SlideInTop(androidx.appcompat.R.anim.abc_slide_in_top),
SlideOutTop(androidx.appcompat.R.anim.abc_slide_out_top),
SlideInRight(renetik.android.R.anim.cs_slide_in_right),
SlideOutLeft(renetik.android.R.anim.cs_slide_out_left),
SlideInRight(renetik.android.ui.R.anim.cs_slide_in_right),
SlideOutLeft(renetik.android.ui.R.anim.cs_slide_out_left),
SlideInBottom(androidx.appcompat.R.anim.abc_slide_in_bottom),
SlideOutBottom(androidx.appcompat.R.anim.abc_slide_out_bottom),
None(0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class CSNavigationView : CSActivityView<FrameLayout>, CSNavigationItem {
val controllers get() = _controllers.values

private val backgroundView =
View(this).also { it.background(color(renetik.android.R.color.cs_dialog_background)) }
View(this).also { it.background(color(renetik.android.ui.R.color.cs_dialog_background)) }

// WORKAROUND CODE:
// I had issue with EditText after focus when removed by pop,Activity.onBackPressed was never fired again
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 1 addition & 2 deletions library/renetik-android-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'
apply from: '../../library.gradle'
2 changes: 0 additions & 2 deletions library/renetik-android-event/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ class CSEventImpl<T> : CSEvent<T> {
} else logError("Listener not found")
}

@Deprecated("Just for debugging")
override val registrations get() = listeners

override fun pause(): Closeable {
Expand Down
3 changes: 0 additions & 3 deletions library/renetik-android-framework/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
api project(':renetik-android-core')
api project(':renetik-android-json')
Expand All @@ -15,6 +13,5 @@ dependencies {
api project(':renetik-android-imaging')
api project(':renetik-android-controller')
api project(':renetik-android-controller-maps')

api 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
}
25 changes: 12 additions & 13 deletions library/renetik-android-framework/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="renetik.android.framework"
xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<provider
android:name=".GetPictureFileProvider"
android:authorities="${applicationId}.renetik.android.framework.controller.getpicture.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_provider"/>
</provider>
</application>
<manifest package="renetik.android.framework">
<!-- <application>-->
<!-- <provider-->
<!-- android:name=".controller.getpicture.GetPictureFileProvider"-->
<!-- android:authorities="${applicationId}.renetik.android.framework.controller.getpicture.fileprovider"-->
<!-- android:exported="false"-->
<!-- android:grantUriPermissions="true">-->
<!-- <meta-data-->
<!-- android:name="android.support.FILE_PROVIDER_PATHS"-->
<!-- android:resource="@xml/file_provider"/>-->
<!-- </provider>-->
<!-- </application>-->
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import renetik.android.core.logging.CSLog.logWarn
import renetik.android.imaging.extensions.resizeImage
import java.io.File

// TODO: Not working right now...
class CSGetPictureView<T : View>(
parent: CSActivityView<T>, val title: String, private val folder: File,
private val onImageReady: (File) -> Unit) : CSActivityView<T>(parent) {
Expand Down
2 changes: 0 additions & 2 deletions library/renetik-android-imaging/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
implementation project(':renetik-android-event')
Expand Down
2 changes: 0 additions & 2 deletions library/renetik-android-json/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
}
7 changes: 0 additions & 7 deletions library/renetik-android-material/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
ext.publish_module_name = 'material'
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
implementation project(':renetik-android-event')
implementation project(':renetik-android-ui')
implementation project(':renetik-android-controller')
implementation "com.google.android.material:material:$material_version"

}
repositories {
mavenCentral()
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ import androidx.core.widget.doAfterTextChanged
import com.google.android.material.internal.CheckableImageButton
import com.google.android.material.textfield.TextInputLayout
import com.google.android.material.textfield.TextInputLayout.END_ICON_CUSTOM
import renetik.android.R
import renetik.android.event.CSEvent.Companion.event
import renetik.android.event.property.CSEventProperty
import renetik.android.ui.protocol.CSVisibleEventOwner
import renetik.android.core.kotlin.notNull
import renetik.android.core.kotlin.privateField
import renetik.android.event.CSEvent
import renetik.android.event.CSEvent.Companion.event
import renetik.android.event.fire
import renetik.android.event.listen
import renetik.android.event.property.CSEventProperty
import renetik.android.ui.R
import renetik.android.ui.extensions.view.gone
import renetik.android.ui.extensions.view.propertyWithTag
import renetik.android.ui.extensions.widget.*
import renetik.android.ui.protocol.CSVisibleEventOwner

val <T : TextInputLayout> T.startIconView: CheckableImageButton?
get() = privateField("startIconView")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@
<item name="android:layout_weight">1</item>
</style>


<style name="CSInputTextPickerMatchWrap" parent="CSInputTextMatchWrap">
<item name="android:inputType">textFilter|textMultiLine|textNoSuggestions</item>
<item name="android:cursorVisible">false</item>
Expand Down Expand Up @@ -224,4 +223,12 @@
<item name="android:background">?attr/colorPrimaryVariant</item>
</style>

<style name="CSActionBarSearchView" parent="Widget.AppCompat.SearchView.ActionBar">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:editTextColor">@android:color/white</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textAppearance">@style/CSTextActionBarSearch</item>
<item name="android:textColorHint">@android:color/white</item>
</style>
</resources>
5 changes: 0 additions & 5 deletions library/renetik-android-network/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
implementation project(':renetik-android-json')
implementation project(':renetik-android-event')
implementation project(':renetik-android-store')
}
repositories {
mavenCentral()
}
5 changes: 0 additions & 5 deletions library/renetik-android-preset/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
implementation project(':renetik-android-json')
implementation project(':renetik-android-event')
implementation project(':renetik-android-store')
}
repositories {
mavenCentral()
}
5 changes: 0 additions & 5 deletions library/renetik-android-store/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
implementation project(':renetik-android-json')
implementation project(':renetik-android-event')
}
repositories {
mavenCentral()
}
2 changes: 0 additions & 2 deletions library/renetik-android-ui-picker/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
implementation project(':renetik-android-ui')
Expand Down
7 changes: 1 addition & 6 deletions library/renetik-android-ui/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
apply from: '../../library.gradle'
apply plugin: 'kotlin-android'

dependencies {
implementation project(':renetik-android-core')
implementation project(':renetik-android-event')
}
repositories {
mavenCentral()
}
}
2 changes: 1 addition & 1 deletion library/renetik-android-ui/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="renetik.android" />
<manifest package="renetik.android.ui" />
Loading

0 comments on commit eefe9f3

Please sign in to comment.