From 72f95f70b944364f4b12fc1bcf63458844b21720 Mon Sep 17 00:00:00 2001 From: mjaillot Date: Thu, 5 Mar 2020 18:38:10 +0100 Subject: [PATCH] Merge --- app/src/main/AndroidManifest.xml | 1 + .../java/com/h/pixeldroid/MainActivity.kt | 8 ++ .../java/com/h/pixeldroid/ProfileActivity.kt | 104 ++++++++++++++ app/src/main/res/layout/activity_main.xml | 8 ++ app/src/main/res/layout/activity_profile.xml | 129 ++++++++++++++++++ 5 files changed, 250 insertions(+) create mode 100644 app/src/main/java/com/h/pixeldroid/ProfileActivity.kt create mode 100644 app/src/main/res/layout/activity_profile.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 65a49e26..5cb11a59 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> + diff --git a/app/src/main/java/com/h/pixeldroid/MainActivity.kt b/app/src/main/java/com/h/pixeldroid/MainActivity.kt index c1f5d901..3ee8fde1 100644 --- a/app/src/main/java/com/h/pixeldroid/MainActivity.kt +++ b/app/src/main/java/com/h/pixeldroid/MainActivity.kt @@ -1,8 +1,11 @@ package com.h.pixeldroid +import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.util.Log +import android.view.View +import android.widget.Button import com.h.pixeldroid.api.PixelfedAPI import com.h.pixeldroid.objects.Status import retrofit2.Call @@ -58,5 +61,10 @@ class MainActivity : AppCompatActivity() { Log.e("Ouch, not OK", t.toString()) } }) + + val button = findViewById