diff --git a/app/build.gradle b/app/build.gradle index c28c3cd..c13149b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,7 @@ import groovy.xml.MarkupBuilder apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' def twaManifest = [ applicationId: 'website.christine.xesite', @@ -153,6 +154,9 @@ android { lintOptions { checkReleaseBuilds false } + buildFeatures { + viewBinding true + } } task generateShorcutsFile { @@ -202,5 +206,6 @@ dependencies { implementation 'com.google.androidbrowserhelper:locationdelegation:1.0.0' implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.2.0' - + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "com.android.support:support-compat:28.0.0" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 11d1cd4..1f68122 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,48 +1,33 @@ - - - + + + + + + + + - - @@ -52,69 +37,56 @@ android:name="android.support.customtabs.trusted.MANAGE_SPACE_URL" android:value="@string/launchUrl" /> - - - - - - - - - - - - - + - @@ -126,9 +98,7 @@ android:scheme="https" /> - - @@ -147,14 +117,14 @@ android:name=".DelegationService" android:enabled="@bool/enableNotification" android:exported="@bool/enableNotification"> - + - - + + \ No newline at end of file diff --git a/app/src/main/java/website/christine/xesite/Application.java b/app/src/main/java/website/christine/xesite/Application.kt similarity index 78% rename from app/src/main/java/website/christine/xesite/Application.java rename to app/src/main/java/website/christine/xesite/Application.kt index aa89f6a..c818d01 100644 --- a/app/src/main/java/website/christine/xesite/Application.java +++ b/app/src/main/java/website/christine/xesite/Application.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package website.christine.xesite; +package website.christine.xesite +import android.app.Application -public class Application extends android.app.Application { - @Override - public void onCreate() { - super.onCreate(); +class Application : Application() { + override fun onCreate() { + super.onCreate() } -} +} \ No newline at end of file diff --git a/app/src/main/java/website/christine/xesite/DelegationService.java b/app/src/main/java/website/christine/xesite/DelegationService.java deleted file mode 100644 index 252e8cb..0000000 --- a/app/src/main/java/website/christine/xesite/DelegationService.java +++ /dev/null @@ -1,14 +0,0 @@ -package website.christine.xesite; - -import com.google.androidbrowserhelper.locationdelegation.LocationDelegationExtraCommandHandler; - -public class DelegationService extends - com.google.androidbrowserhelper.trusted.DelegationService { - @Override - public void onCreate() { - super.onCreate(); - - registerExtraCommandHandler(new LocationDelegationExtraCommandHandler()); - } -} - diff --git a/app/src/main/java/website/christine/xesite/DelegationService.kt b/app/src/main/java/website/christine/xesite/DelegationService.kt new file mode 100644 index 0000000..ad467cd --- /dev/null +++ b/app/src/main/java/website/christine/xesite/DelegationService.kt @@ -0,0 +1,11 @@ +package website.christine.xesite + +import com.google.androidbrowserhelper.locationdelegation.LocationDelegationExtraCommandHandler +import com.google.androidbrowserhelper.trusted.DelegationService + +class DelegationService : DelegationService() { + override fun onCreate() { + super.onCreate() + registerExtraCommandHandler(LocationDelegationExtraCommandHandler()) + } +} \ No newline at end of file diff --git a/app/src/main/java/website/christine/xesite/LauncherActivity.java b/app/src/main/java/website/christine/xesite/LauncherActivity.kt similarity index 69% rename from app/src/main/java/website/christine/xesite/LauncherActivity.java rename to app/src/main/java/website/christine/xesite/LauncherActivity.kt index ddf4d8f..ebf6c4e 100644 --- a/app/src/main/java/website/christine/xesite/LauncherActivity.java +++ b/app/src/main/java/website/christine/xesite/LauncherActivity.kt @@ -13,18 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package website.christine.xesite; +package website.christine.xesite -import android.net.Uri; +import android.net.Uri +import com.google.androidbrowserhelper.trusted.LauncherActivity -public class LauncherActivity - extends com.google.androidbrowserhelper.trusted.LauncherActivity { - - @Override - protected Uri getLaunchingUrl() { +class LauncherActivity : LauncherActivity() { + override fun getLaunchingUrl(): Uri { // Get the original launch Url. - Uri uri = super.getLaunchingUrl(); - - return uri; + return super.getLaunchingUrl() } -} +} \ No newline at end of file diff --git a/app/src/main/java/website/christine/xesite/NewPostWidget.kt b/app/src/main/java/website/christine/xesite/NewPostWidget.kt new file mode 100644 index 0000000..236d200 --- /dev/null +++ b/app/src/main/java/website/christine/xesite/NewPostWidget.kt @@ -0,0 +1,46 @@ +package website.christine.xesite + +import android.appwidget.AppWidgetManager +import android.appwidget.AppWidgetProvider +import android.content.Context +import android.widget.LinearLayout +import android.widget.RemoteViews + +/** + * Implementation of App Widget functionality. + */ +class NewPostWidget : AppWidgetProvider() { + override fun onUpdate( + context: Context, + appWidgetManager: AppWidgetManager, + appWidgetIds: IntArray + ) { + // There may be multiple widgets active, so update all of them + for (appWidgetId in appWidgetIds) { + updateAppWidget(context, appWidgetManager, appWidgetId) + } + } + + override fun onEnabled(context: Context) { + // Enter relevant functionality for when the first widget is created + val views = RemoteViews(context.packageName, R.layout.new_post_widget) + } + + override fun onDisabled(context: Context) { + // Enter relevant functionality for when the last widget is disabled + } +} + +internal fun updateAppWidget( + context: Context, + appWidgetManager: AppWidgetManager, + appWidgetId: Int +) { + // Construct the RemoteViews object + val views = RemoteViews(context.packageName, R.layout.new_post_widget) + views.setTextViewText(R.id.article_title, "My Thoughts About Using Android Again as an iPhone User") + views.setTextViewText(R.id.appwidget_text2, "I used to be a hardcore Android user. It was my second major kind of smartphone (the first was Windows Mobile 6.1 on a T-Mobile Dash) and it left me hooked to the concept of smartphones and connected tech in general.") + + // Instruct the widget manager to update the widget + appWidgetManager.updateAppWidget(appWidgetId, views) +} \ No newline at end of file diff --git a/app/src/main/res/drawable-nodpi/example_appwidget_preview.png b/app/src/main/res/drawable-nodpi/example_appwidget_preview.png new file mode 100644 index 0000000..894b069 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/example_appwidget_preview.png differ diff --git a/app/src/main/res/layout/new_post_widget.xml b/app/src/main/res/layout/new_post_widget.xml new file mode 100644 index 0000000..a711bca --- /dev/null +++ b/app/src/main/res/layout/new_post_widget.xml @@ -0,0 +1,76 @@ + + + + + + + + +